1、优化订单填报，实现多图片上传

2、编写测试数据，进行相关测试

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

@@ -14,6 +14,14 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties(prefix = "img")
 @Data
 public class MyImgConfig {
+
+    /**
+     * 图片保存地址
+     */
     private String saveLocation;
+
+    /**
+     * 图片显示地址
+     */
     private String showHost;
 }

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

@@ -0,0 +1,47 @@
+package com.chuanghai.repair.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Author: bingo
+ * @Date: 2022/3/9 星期三 19:18
+ * @Description: com.chuanghai.repair.config
+ * @version: 1.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "weixiao")
+@Data
+public class WeixiaoConfig {
+
+    /**
+     * 腾讯微卡分配的授权凭证
+     */
+    private String appKey;
+
+    /**
+     * 授权凭证密钥
+     */
+    private String appSecret;
+
+    /**
+     * 南昌交通学院：主体代码
+     */
+    private String ocode;
+
+    /**
+     * 微校通知的标题
+     */
+    private String title;
+
+    /**
+     * 微校通知的内容
+     */
+    private String content;
+
+    /**
+     * 微校通知发起单位
+     */
+    private String sender;
+}

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

@@ -2,6 +2,7 @@ package com.chuanghai.repair.controller;
 
 
 import com.chuanghai.repair.auth.CacheListener;
+import com.chuanghai.repair.config.WeixiaoConfig;
 import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.service.RepairsOrderService;
 import com.chuanghai.repair.service.RepairsWorkService;
@@ -47,12 +48,13 @@ public class AutoSendOrderCentroller implements ApplicationListener<ContextRefre
 
     static HashMap<String, String> orderMap = new HashMap<>();
 
-
+    @Resource
+    private WeixiaoConfig weixiaoConfig;
 
     @Override
     public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
-        //String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobalA(weixiaoConfig.getApp_key(),weixiaoConfig.getApp_secret(),weixiaoConfig.getOcode());
-        String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobal();
+        String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobalA(weixiaoConfig.getAppKey(),weixiaoConfig.getAppSecret(),weixiaoConfig.getOcode());
+       // String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobal();
         CacheManagerImpl cacheManagerImpl = new CacheManagerImpl();
         CacheListener cacheListener = new CacheListener(cacheManagerImpl);
         cacheManagerImpl.putCache("cache_token", accessTokenGlobal, 2*3610 * 1000L); //access_token 在2*3600*1000L 过期
@@ -61,11 +63,13 @@ public class AutoSendOrderCentroller implements ApplicationListener<ContextRefre
 
     }
 
- //   @Scheduled(cron = "0 0/30 * * * ?") //    0 0/30 * * * ?    30分钟调用一次
+    /**
+     * 30分钟查询一次已接订单的完成时间，30分钟发送通知一次
+     */
     @Scheduled(cron = "0 0/30 * * * ?") //    0 0/30 * * * ?    30分钟调用一次
     public void autoQueryOrder(){
-       // String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobalA(weixiaoConfig.getApp_key(),weixiaoConfig.getApp_secret(),weixiaoConfig.getOcode());
-        String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobal();
+        String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobalA(weixiaoConfig.getAppKey(),weixiaoConfig.getAppSecret(),weixiaoConfig.getOcode());
+       // String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobal();
         CacheManagerImpl cacheManagerImpl = new CacheManagerImpl();
         CacheListener cacheListener = new CacheListener(cacheManagerImpl);
         cacheManagerImpl.putCache("cache_token", accessTokenGlobal, 2*3610 * 1000L); //access_token 在2*3600*1000L 过期
@@ -75,24 +79,23 @@ public class AutoSendOrderCentroller implements ApplicationListener<ContextRefre
             Calendar calendar = Calendar.getInstance();
             String systemTime = sdf.format(calendar.getTime());
             calendar.add(Calendar.MINUTE, 30);
-           // calendar.add(Calendar.MINUTE, 1);
             String changeTime = sdf.format(calendar.getTime());
-
+            //每30分钟查询一次数据库，收集订单集合
             List<RepairsOrder> orderList = repairsOrderService.queryByTime(systemTime, changeTime);
 
             String idList = orderList.stream().filter(e -> e.getRepairsStudent() != null)
                     .map(e -> e.getRepairsStudent().getStudentId()).collect(Collectors.toSet()).toString();
 
-            String title = "寝室维修通知";
-            String content = "同学你好，你的寝室报修单已被维修师傅接单，维修师傅将于半小时后上门维修；请合理安排时间，谢谢合作。";
-            String sender = "寝室管理办公室";
+           // String title = "寝室维修通知";
+           // String content = "同学你好，你的寝室报修单已被维修师傅接单，维修师傅将于半小时后上门维修；请合理安排时间，谢谢合作。";
+           // String sender = "寝室管理办公室";
             String access_token = new CacheManagerImpl().getCacheByKey("cache_token").getDatas().toString();
-System.out.println("access_token_global:  "+access_token);
+
             Map<String, String> param = new HashMap<>();
-            param.put("title", title);
+            param.put("title", weixiaoConfig.getTitle());
             param.put("cards", idList);
-            param.put("content", content);
-            param.put("sender", sender);
+            param.put("content", weixiaoConfig.getContent());
+            param.put("sender", weixiaoConfig.getSender());
             String url = "https://open.wecard.qq.com/cgi-bin/notice/send?access_token=" + access_token;
 
             RestTemplate restTemplate = new RestTemplate();

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

@@ -21,7 +21,7 @@ import java.util.List;
 @Api(tags = "宿舍管理")
 @RestController
 @RequestMapping("/build")
-public class BuildRoomController {
+public class BuildFloorRoomController {
 
     @Resource(name ="repairsBuildRoomService" )
     private RepairsBuildRoomService repairsBuildRoomService;
@@ -41,4 +41,20 @@ public class BuildRoomController {
         }
         return ReturnValueUtil.returnObject(roomList);
     }
+
+    /**
+     * 查询所有楼栋信息  显示楼栋数
+     */
+
+
+    /**
+     * 通过楼栋ID 查询相关楼栋的楼层情况  显示楼层数
+     */
+
+    /**
+     * 通过楼层ID 查询相关楼层的房间情况  显示房间号
+     */
+
+
+
 }

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

@@ -2,6 +2,7 @@ package com.chuanghai.repair.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.chuanghai.repair.config.WeixiaoConfig;
 import com.chuanghai.repair.entity.*;
 import com.chuanghai.repair.service.RepairsAdminService;
 import com.chuanghai.repair.service.RepairsStudentService;
@@ -12,6 +13,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -42,7 +44,8 @@ public class LoginController {
     @Resource(name = "repairsStudentService")
     private RepairsStudentService repairsStudentService;
 
-
+    @Autowired
+    WeixiaoConfig weixiaoConfig;
 
     /**
      * 管理员登录
@@ -56,7 +59,7 @@ public class LoginController {
                              @ApiParam(name = "管理员密码", required = true) String password) {
         String adminIdToken = "";
         try {
-            if(phone != "" && phone != null && password != "" && password != null){
+            if(!phone.equals("") && !password.equals("")){
                 RepairsAdmin repairsAdmin = repairsAdminService.loginAdmin(phone, password);
                 adminIdToken = CreateTokenUtil.getToken(String.valueOf(repairsAdmin.getAdminId()));
             }
@@ -80,7 +83,7 @@ public class LoginController {
 
         String workIdToken = "";
         try {
-            if(phone != "" && phone != null && password != "" && password != null){
+            if(!phone.equals("") && !password.equals("")){
                 RepairsWork repairsWork = repairsWorkService.loginWork(phone, password);
                 workIdToken = CreateTokenUtil.getToken(String.valueOf(repairsWork.getWorkId()));
             }
@@ -90,12 +93,14 @@ public class LoginController {
         return ReturnValueUtil.returnString(workIdToken);
     }
 
-    @GetMapping(value = "getInfo")
-    public String getInfo(String wxcode,String state){
-        System.out.println(wxcode);
-        return "";
-    }
-
+    /**
+     * 通过wxcode 获取对应的acces_token，再通过access_token的用户的具体信息，
+     *    如果用户不存在数据库就将其添加到数据库中
+     *    最后将用户的card_number用token规则封装返回前端保存
+     * @param wxcode
+     * @param state
+     * @return
+     */
     @ApiIgnore  //使该接口隐藏
     @ApiOperation("获取学生CardNumber")
     @GetMapping("/getCardNumber")
@@ -104,15 +109,13 @@ public class LoginController {
         String cardNumberToken = "";
         String accessToken = "";
         try {
-            String app_key = "EE28EE2C93296F4E";
-            String app_secret = "5071958561AA629530AAA31503088330";
             String grant_type = "authorization_code";
             String redirect_uri = "http://binguo.vaiwan.com/login/getCardNumber";
             String url = "https://open.wecard.qq.com/connect/oauth2/token"; //用于用户 获取基础的access_token
             Map<String, String> param = new HashMap<>();
             param.put("wxcode", wxcode);
-            param.put("app_key", app_key);
-            param.put("app_secret", app_secret);
+            param.put("app_key", weixiaoConfig.getAppKey());
+            param.put("app_secret", weixiaoConfig.getAppSecret());
             param.put("grant_type", grant_type);
             param.put("redirect_uri", redirect_uri);
 
@@ -146,7 +149,6 @@ public class LoginController {
             String studentOtherPhone = "";
             String studentClazz = "";
             String dormNumber = "";
-            String studentDormitory = "";
             String studentStatus = "1";
             String studentCampus = "";
             String cardNumber = "";
@@ -172,9 +174,6 @@ public class LoginController {
                     if (entry.getKey().equals("dorm_number")) {
                         dormNumber = (String) entry.getValue();
                     }
-                    if (entry.getKey().equals("dorm_number")) {
-                        studentDormitory = (String) entry.getValue();
-                    }
                     if (entry.getKey().equals("campus")) {
                         studentCampus = (String) entry.getValue();
                     }
@@ -185,15 +184,13 @@ public class LoginController {
             }
             RepairsStudent repairsStudent = new RepairsStudent(studentId, studentName, studentSex,
                     studentPhone, studentOtherPhone, studentClazz, dormNumber,
-                    studentDormitory, studentStatus, studentCampus, cardNumber);
+                    studentCampus, null, studentStatus, cardNumber,"0");
             RepairsStudent student = repairsStudentService.queryByStudentId(studentId);
-            System.out.println(student);
+            //判断该用户在数据库中不存在就新增到数据库中
             if (student == null) {
                 repairsStudentService.insertStudent(repairsStudent);
             }
             cardNumberToken = CreateTokenUtil.getToken(cardNumber);
-
-
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.controller;
 
+import ch.qos.logback.core.net.SyslogOutputStream;
 import com.chuanghai.repair.config.MyImgConfig;
 import com.chuanghai.repair.entity.RepairsFault;
 import com.chuanghai.repair.entity.RepairsOrder;
@@ -18,12 +19,15 @@ 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;
 
@@ -57,17 +61,19 @@ public class OrderController {
      * @param time
      * @return
      */
-    @ApiOperation("PC端查询订单")
+    @ApiOperation("PC端:查询订单")
     @PostMapping(value = "/queryAllOrderByDate")
     public PageInfo<RepairsOrder> queryAllOrderByDate(@ApiParam(name = "查询日期") String time,
-                                                      Integer pageNum) {
+                                                      @ApiParam(name = "当前页码")Integer pageNum,
+                                                      @ApiParam(name = "每页记录数")Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
+        pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
             String tody = "";
             String tomorrow = "";
             String status = "";
-            if (time != "" && time != null) {
+            if (time != null && !time.equals("")) {
 
                 //前端日期数据由 String转Date
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -83,7 +89,7 @@ public class OrderController {
                 tomorrow = sdf.format(calendar.getTime());
 
             }
-            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, tody, tomorrow, status);
+            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize, tody, tomorrow, status);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -93,16 +99,18 @@ public class OrderController {
 
     /**
      * @param
-     * @return
+     * @return PageInfo<RepairsOrder>
      */
-    @ApiOperation("PC端派送订单查询")
+    @ApiOperation("PC端:派送订单查询")
     @PostMapping(value = "/queryAllOrderByStatus")
-    public PageInfo<RepairsOrder> queryAllOrderByDateStatus(Integer pageNum) {
+    public PageInfo<RepairsOrder> 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, null, null, status);
+            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, pageSize,null, null, status);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -110,17 +118,18 @@ public class OrderController {
         return pageInfoOrder;
     }
 
-    /**
-     * @param
-     * @return
+    /**通过请求中的 当前页码及每页记录数分页查询意见投诉
+     * @return PageInfo<RepairsOrder>
      */
-    @ApiOperation("PC端意见投诉查询")
+    @ApiOperation("意见投诉查询")
     @PostMapping(value = "/queryAllOrderByAdvice")
-    public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum) {
+    public PageInfo<RepairsOrder> 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);
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -132,16 +141,16 @@ public class OrderController {
      *
      * @param orderId
      * @param
-     * @return
+     * @return ReturnValueUtil
      */
-    @ApiOperation("PC端订单派送")
+    @ApiOperation("PC端:订单派送")
     @PostMapping(value = "/updateRepairsOrderBath")
     public ReturnValueUtil updateRepairsOrderBath(@ApiParam(name = "订单ID", required = true) String orderId,
-                                                  @ApiParam(name = "订单ID", required = true) Integer workId) {
+                                                  @ApiParam(name = "维修工ID", required = true) Integer workId) {
         Boolean flag = Boolean.FALSE;
         try {
 
-            if (orderId != "" && orderId != null && workId != null) {
+            if (!orderId.equals("") && workId != null) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Calendar calendar = Calendar.getInstance();
                 Date time = calendar.getTime();
@@ -170,19 +179,18 @@ public class OrderController {
     /**
      * 修改订单状态  退单+退单理由   orderStatus = 4
      *
-     * @param
      * @param orderId
      * @param orderBack
-     * @return
+     * @return ReturnValueUtil
      */
-    @ApiOperation("PC端退回订单")
+    @ApiOperation("PC端:退回订单")
     @PostMapping(value = "/updateOrderBack")
     public ReturnValueUtil updateOrderBack(
             @ApiParam(name = "订单ID", required = true) String orderId,
             @ApiParam(name = "退回理由", required = true) String orderBack) {
         Boolean flag = Boolean.FALSE;
         try {
-            if (orderId != "" && orderId != null) {
+            if (!orderId.equals("")) {
                 //当workId不为null时 数据库不会执行更新workId的sql
                 RepairsWork repairsWork = new RepairsWork();
                 RepairsOrder repairsOrder = new RepairsOrder();
@@ -207,49 +215,51 @@ public class OrderController {
     /**
      * 通过ID查询订单信息
      *
-     * @param
-     * @param
-     * @param
-     * @return
+     * @return ReturnValueUtil
      */
-    @ApiOperation("学生订单查询")
+    @ApiOperation("学生:订单查询")
     @PostMapping(value = "/queryAllOrderByStudentId")
-    public ReturnValueUtil queryAllOrderByStudentId(HttpServletRequest request) {
-        List<RepairsOrder> orderList = null;
+    public PageInfo<RepairsOrder> 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;
         try {
             String studentId = CreateTokenUtil.getHeadersInfo(request); //从请求头中获取  studentId
             RepairsStudent repairsStudent = repairsStudentService.queryByStudentId(studentId);
             String campus = repairsStudent.getStudentCampus();
-            orderList = repairsOrderService.queryAllOrderById(studentId, null, campus);
+            pageInfoOrder = repairsOrderService.queryAllOrderById(pageNum, pageSize, studentId, null, campus);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ReturnValueUtil.returnObject(orderList);
+        return pageInfoOrder;
     }
 
     /**
      * 通过ID查询订单信息
      *
-     * @param
-     * @param
-     * @param
-     * @return
+     * @return ReturnValueUtil
      */
-    @ApiOperation("维修工订单查询")
+    @ApiOperation("维修工:订单查询")
     @PostMapping(value = "/queryAllOrderByWorkId")
-    public ReturnValueUtil queryAllOrderByWorkId(HttpServletRequest request) {
-        List<RepairsOrder> orderList = null;
+    public PageInfo<RepairsOrder> 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;
         try {
             String workId = CreateTokenUtil.getHeadersInfo(request);
             RepairsWork repairsWork = repairsWorkService.queryByWorkId(workId);
             String campus = repairsWork.getWorkCampus();
-            orderList = repairsOrderService.queryAllOrderById(null, workId, campus);
+            pageInfoOrder = repairsOrderService.queryAllOrderById(pageNum, pageSize,null, workId, campus);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ReturnValueUtil.returnObject(orderList);
+        return pageInfoOrder;
     }
 
 
@@ -260,14 +270,14 @@ public class OrderController {
      * @param orderAdvice
      * @return
      */
-    @ApiOperation("学生售后评价")
+    @ApiOperation("学生:售后评价")
     @PostMapping(value = "/updateOrderAdvice")
     public ReturnValueUtil updateOrderAdvice(@ApiParam(name = "订单ID", required = true) String orderId,
                                              @ApiParam(name = "订单评价", required = true) String orderAdvice) {
 
         Boolean flag = Boolean.FALSE;
         try {
-            if (orderAdvice != "" && orderAdvice != null && orderId != "" && orderId != null) {
+            if (!orderAdvice.equals("") && !orderId.equals("")) {
                 repairsOrderService.updateOrderAdvice(orderId, orderAdvice);
                 flag = Boolean.TRUE;
             }
@@ -278,25 +288,23 @@ public class OrderController {
     }
 
     /**
-     * 查询指定订单ID 的订单信息    故障图片地址 http://binguo.vaiwan.com/images/1c843e19-6858-48a8-8c41-cbc80b5804ffperson.jpg
+     * 查询指定订单ID 的订单信息
      *
      * @param orderId
      * @return
      */
-    @ApiOperation("订单详情查看")
+    @ApiOperation("订单:详情查看")
     @PostMapping(value = "/queryByOrderId")
     public ReturnValueUtil queryByOrderId(@ApiParam(name = "订单ID", required = true) String orderId) {
         RepairsOrder repairsOrder = null;
         try {
-            if (orderId != "" && orderId != null) {
+            if (!orderId.equals("")) {
                 repairsOrder = repairsOrderService.queryByOrderId(orderId);
                 String imageName = repairsOrder.getOrderImages();
-                //String imageUrlName = SubUtil.subAfter(imageName);
                 if (StringUtils.hasText(imageName)) {
                     repairsOrder.setOrderImages(myImgConfig.getShowHost() + imageName);
                 }
             }
-
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -304,22 +312,36 @@ public class OrderController {
     }
 
 
-    @ApiOperation("学生订单填报")
+    /**
+     * 获取请求头中的access_token解码的到card_number学生ID,将获取的订单信息新增到订单表中
+     * @param request
+     * @param orderType
+     * @param orderExpectedTime
+     * @param faultId
+     * @param otherPhone
+     * @param dormNumber
+     * @param orderNote
+     * @param file
+     * @return ReturnValueUtil
+     */
+    @ApiOperation("学生:订单填报")
     @PostMapping(value = "/insertOrder")
     public ReturnValueUtil insertOrder(HttpServletRequest request,
                                        @ApiParam(name = "故障类型", required = true) String orderType,
-                                       @ApiParam(name = "订单备注", required = true) String orderNote,
                                        @ApiParam(name = "维修期望时间", required = true) String orderExpectedTime,
                                        @ApiParam(name = "故障类型ID", required = true) Integer faultId,
-                                       @ApiParam(name = "备选电话") String otherPhone,
-                                       @ApiParam(name = "学生宿舍") String dormNumber,
-                                       @ApiParam(name = "故障图片 orderImages", required = true) MultipartFile file) {
+                                       @ApiParam(name = "备选电话", required = true) String otherPhone,
+                                       @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) {
         Boolean flag = Boolean.FALSE;
         try {
             String cardNumber = CreateTokenUtil.getHeadersInfo(request);
             RepairsStudent repairsStudent = new RepairsStudent();
             repairsStudent.setStudentId(cardNumber);
             repairsStudent.setDormNumber(dormNumber);
+            repairsStudent.setStudentDormitory(studentDormitory);
             repairsStudent.setStudentOtherPhone(otherPhone);
             ArrayList<RepairsStudent> repairsStudentList = new ArrayList<>();
             repairsStudentList.add(repairsStudent);
@@ -336,24 +358,34 @@ public class OrderController {
             RepairsOrder repairsOrder = new RepairsOrder();
             RepairsFault repairsFault = new RepairsFault(faultId, null, null, null, orderType);
             //获取原始图片的拓展名
-            String originalFilename = file.getOriginalFilename();
-            int index = originalFilename.lastIndexOf('.') + 1;//获取地址.的前面的数字，从0开始
-            String type = originalFilename.substring(index);//从地址.开始截取后缀
-            String orderImages = repairsOrder.getOrderImages();
-            //保存图片的路径（这是存在我项目中的images下了，你们可以设置路径）
-            // String filePath="E:\\springboot\\src\\main\\resources\\static\\images";
-            String filePath = myImgConfig.getSaveLocation();
-            //生成新文件名字
-            String newFileName = UUID.randomUUID().toString().replaceAll("-","")+"_"+ originalFilename;
-            // 封装上传文件位置的全路径
-            File targetFile = new File(filePath, newFileName);
-            //把本地文件上传到封装上传文件位置的全路径
-            file.transferTo(targetFile);
-            repairsOrder.setOrderImages(newFileName);
-            if (type.equals("jpg") || type.equals("gif")) {
-                if (newFileName != null && newFileName != "") {
+            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, newFileName, orderNote, orderExpectedTime,
+                    repairsOrder = new RepairsOrder(orderId, fileNameSaveUrl, orderNote, orderExpectedTime,
                             null, date, null, "0", null, "0",
                             null, repairsStudent, repairsWork, repairsFault, orderType);
                     repairsOrderService.insertOrder(repairsOrder);
@@ -367,22 +399,6 @@ public class OrderController {
     }
 
 
-    /**
-     * 移动端查询所有用户评价的订单信息
-     * @param
-     * @return
-     */
-    @ApiOperation("学生：用户评价")
-    @PostMapping(value = "/queryAllOrderUserAdvice")
-    public ReturnValueUtil queryAllOrderUserAdvice() {
-        List<RepairsOrder> OrderList = null;
-        try {
-            OrderList = repairsOrderService.queryAllOrderUserAdvice();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return ReturnValueUtil.ok(OrderList);
-    }
 
     /**
      * 修改订单状态  已完成 orderStatus = 3
@@ -391,7 +407,7 @@ public class OrderController {
      * @param orderId
      * @return
      */
-    @ApiOperation("维修工订单已完成")
+    @ApiOperation("维修工:订单已完成")
     @PostMapping(value = "/updateOrderFinish")
     public ReturnValueUtil updateOrderFinish(HttpServletRequest request,
                                              @ApiParam(name = "订单ID", required = true) String orderId) {
@@ -400,8 +416,7 @@ public class OrderController {
             //当workId不为null时 数据库不会执行更新workId的sql
             RepairsWork repairsWork = new RepairsWork();
             repairsWork.setWorkId(1);
-
-            if (orderId != "" && orderId != null) {
+            if (!orderId.equals("")) {
                 RepairsOrder repairsOrder = new RepairsOrder(orderId, null, null, null,
                         null, null, null, "3", null,
                         null, null, null, repairsWork, null, null);
@@ -425,12 +440,12 @@ public class OrderController {
      * @param
      * @return
      */
-    @ApiOperation("维修工拒绝订单")
+    @ApiOperation("维修工:拒绝订单")
     @PostMapping(value = "/updateOrderRefused")
     public ReturnValueUtil updateOrderRefused(@ApiParam(name = "订单ID", required = true) String orderId) {
         Boolean flag = Boolean.FALSE;
         try {
-            if (orderId != "" && orderId != null) {
+            if (!orderId.equals("")) {
                 RepairsWork repairsWork = new RepairsWork();
                 RepairsOrder repairsOrder = new RepairsOrder(orderId, null, null, null,
                         null, null, null, "0", null,
@@ -455,13 +470,13 @@ public class OrderController {
      * @param
      * @return
      */
-    @ApiOperation("维修工接受订单")
+    @ApiOperation("维修工:接受订单")
     @PostMapping(value = "/updateOrderAccept")
     public ReturnValueUtil updateOrderAccept(@ApiParam(name = "订单ID", required = true) String orderId,
                                              @ApiParam(name = "完成时间", required = true) String completeTime) {
         Boolean flag = Boolean.FALSE;
         try {
-            if (orderId != "" && orderId != null) {
+            if (!orderId.equals("")) {
                 //当workId不为null时 数据库不会执行更新workId的sql
                 RepairsWork repairsWork = new RepairsWork();
                 repairsWork.setWorkId(1);
@@ -481,6 +496,4 @@ public class OrderController {
         }
         return ReturnValueUtil.returnBoolean(flag);
     }
-
-
 }

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

@@ -10,6 +10,7 @@ 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;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -23,6 +24,7 @@ public class StudentController {
     @Resource(name = "repairsStudentService")
     private RepairsStudentService repairsStudentService;
 
+
     @ApiOperation("修改学生信息")
     @PostMapping(value = "/updateStudent")
     public ReturnValueUtil updateStudent(HttpServletRequest request,
@@ -32,13 +34,28 @@ public class StudentController {
                                          @ApiParam(name = "备选手机号码", required = true)String studentOtherPhone,
                                          @ApiParam(name = "学生专业年级班级", required = true)String studentClazz,
                                          @ApiParam(name = "学生宿舍", required = true)String dormNumber,
-                                         @ApiParam(name = "学生校区0（南校区）1（北校区）", required = true)String studentCampus) {
+                                         @ApiParam(name = "楼栋楼层房间ID拼接1-2-10（1栋2层205）", required = true) String studentDormitory,
+                                         @ApiParam(name = "学生校区 0（黄家湖校区）1（靖安校区）", required = true)String studentCampus) {
         Boolean flag = Boolean.FALSE;
         try {
+            if(studentSex.equals("男")){
+                studentSex = "0";
+            }
+            if(studentSex.equals("女")){
+                studentSex = "1";
+            }
+
+            if(studentCampus.equals("黄家湖校区")){
+                studentCampus = "0";
+            }
+            if(studentCampus.equals("靖安校区")){
+                studentCampus = "1";
+            }
+
             String cardNumber = CreateTokenUtil.getHeadersInfo(request);
             RepairsStudent repairsStudent = new RepairsStudent(cardNumber,studentName,studentSex,
                     studentPhone,studentOtherPhone,studentClazz,dormNumber,
-                    studentCampus,null,null,cardNumber);
+                    studentCampus,studentDormitory,null,cardNumber,"1");
 
             if (repairsStudent != null) {
                 repairsStudent.setStudentId(cardNumber);
@@ -52,4 +69,44 @@ public class StudentController {
         }
         return ReturnValueUtil.returnBoolean(flag);
     }
+
+    /**
+     * 通过学号查询学生信息是否更新
+     * @param request
+     * @return
+     */
+    @ApiOperation("判断学生是否需要完善信息")
+    @PostMapping(value = "/queryByID")
+    public ReturnValueUtil queryByID(HttpServletRequest request){
+        String flag = "该学生已完善个人信息";
+        try {
+            String cardNumber = CreateTokenUtil.getHeadersInfo(request);
+            RepairsStudent repairsStudent = repairsStudentService.queryByStudentId(cardNumber);
+            if(repairsStudent.getStudentUpdateStatus().equals("0")){
+                flag = "跳转，完善个人信息";
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnString(flag);
+    }
+
+    /**
+     * 通过学号修改学生状态逻辑删除
+     * @param
+     * @return
+     */
+    @ApiIgnore
+    @ApiOperation("删除学生信息")
+    @PostMapping(value = "/removeStudent")
+    public ReturnValueUtil removeStudent(@ApiParam(name = "学生ID", required = true)String studentId){
+        Boolean flag = Boolean.FALSE;
+        try {
+            repairsStudentService.updateStudentStatus(studentId);
+            flag = Boolean.TRUE;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ReturnValueUtil.returnBoolean(flag);
+    }
 }

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

@@ -44,17 +44,22 @@ public class WorkController {
     public ReturnValueUtil insertWork(@ApiParam(name = "维修工姓名", required = true) String workName,
                                       @ApiParam(name = "登录密码", required = true) String workPassword,
                                       @ApiParam(name = "手机号码", required = true) String workPhone,
-                                      @ApiParam(name = "所在校区", required = true) String workCampus) {
+                                      @ApiParam(name = "服务校区0（黄家湖校区）1（靖安校区）", required = true) String workCampus) {
         Boolean flag = Boolean.FALSE;
         try {
-            if (workName != "" && workName != null && workPhone != "" && workPhone != null) {
+            if(workCampus.equals("黄家湖校区")){
+                workCampus = "0";
+            }
+            if(workCampus.equals("靖安校区")){
+                workCampus = "1";
+            }
+            if (!workName.equals("") && !workPhone.equals("")) {
                 RepairsWork repairsWork = new RepairsWork(null, workName, workPassword, workPhone, "1", "0", workCampus);
                 RepairsWork testWork = repairsWorkService.queryByWorkName(repairsWork.getWorkName());
                 if (testWork != null) {
                     //匹配数据库中同名同手机的用户，相同则表示用户已存在注册失败，不同则用户继续注册
-                    if (repairsWork.getWorkName().equals(testWork.getWorkName()) &&
-                            repairsWork.getWorkPhone().equals(testWork.getWorkPhone())) {
-                    } else {  //继续注册
+                    if (!repairsWork.getWorkName().equals(testWork.getWorkName()) &&
+                            !repairsWork.getWorkPhone().equals(testWork.getWorkPhone())) {
                         repairsWorkService.insertWork(repairsWork);
                         flag = Boolean.TRUE;
                     }
@@ -71,11 +76,11 @@ public class WorkController {
     }
 
     @ApiOperation("维修工删除")
-    @PostMapping(value = "updateWorkStatus")
-    public ReturnValueUtil updateWorkStatus(@ApiParam(name = "维修工ID", required = true) String workId) {
+    @PostMapping(value = "removeWorkStatus")
+    public ReturnValueUtil removeWorkStatus(@ApiParam(name = "维修工ID", required = true) String workId) {
         Boolean flag = Boolean.FALSE;
         try {
-            if (workId != "" && workId != null) {
+            if (!workId.equals("")) {
                 repairsWorkService.updateWorkStatus(workId);
                 flag = Boolean.TRUE;
             }
@@ -88,15 +93,18 @@ public class WorkController {
     /**
      * 查询所有在职维修工
      * @param pageNum
+     * @param pageSize
      * @return
      */
     @ApiOperation("维修工查询")
     @PostMapping(value = "queryAllWorkStatus")
-    public PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) {
+    public PageInfo<RepairsWork> queryAllWorkStatus( @ApiParam(name = "当前页码")Integer pageNum,
+                                                     @ApiParam(name = "每页记录数")Integer pageSize) {
         pageNum = pageNum == null ? 1 : pageNum;
+        pageSize = pageSize == null ? 5 : pageSize;
         PageInfo<RepairsWork> pageInfoWork = null;
         try {
-            pageInfoWork = repairsWorkService.queryAllWorkStatus(pageNum);
+            pageInfoWork = repairsWorkService.queryAllWorkStatus(pageNum, pageSize);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -1,43 +0,0 @@
-package com.chuanghai.repair.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import javax.persistence.*;
-
-@NoArgsConstructor
-@AllArgsConstructor
-@Setter
-@Getter
-@ToString
-@Table(name = "repairs_advice")
-public class RepairsAdvice {
-    /**
-     * 评价建议编号
-     */
-    @ApiModelProperty(value = "评价建议ID")
-    @Id
-    @Column(name = "advice_id")
-    private Integer adviceId;
-
-    /**
-     * 反馈建议
-     */
-    @ApiModelProperty(value = "反馈建议")
-    @Column(name = "advice_options")
-    private String adviceOptions;
-
-    /**
-     * 学生学号
-     */
-    @Column(name = "repairsStudent")
-    private RepairsStudent repairsStudent;
-
-    /**
-     * 订单ID
-     */
-    @Column(name = "repairsOrder")
-    private RepairsOrder repairsOrder;
-
-
-}

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

@@ -3,8 +3,10 @@ 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/entity/RepairsStudent.java

@@ -63,9 +63,9 @@ public class RepairsStudent {
     private String dormNumber;
 
     /**
-     * 学生校区0（南校区）1（北校区）
+     * 学生校区0（黄家湖校区）1（靖安校区）
      */
-    @ApiModelProperty(value ="学生校区0（南校区）1（北校区）" ) //key:campus，value:
+    @ApiModelProperty(value ="学生校区0（黄家湖校区）1（靖安校区）" ) //key:campus，value:
     @Column(name = "student_campus")
     private String studentCampus;
 
@@ -85,12 +85,17 @@ public class RepairsStudent {
     private String studentStatus;
 
 
-
-
     /**
      * 校园卡编号
      */
     @ApiModelProperty(value ="校园卡编号" ) //key:campus，value:
     @Column(name = "card_number")
     private String cardNumber;
+
+    /**
+     * 学生信息更新的状态值   0 (未更新) 1（已更新）
+     */
+    @ApiModelProperty(value ="学生信息更新的状态值" )
+    @Column(name = "student_update_status")
+    private String studentUpdateStatus;
 }

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

@@ -66,7 +66,7 @@ public class RepairsWork {
     /**
      * 工人服务校区0（南校区）1（北校区）
      */
-    @ApiModelProperty(value ="工人服务校区0（南校区）1（北校区）" )
+    @ApiModelProperty(value ="工人服务校区0（黄家湖校区）1（靖安校区）" )
     @Column(name = "work_campus")
     private String workCampus;
 

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

@@ -1,6 +1,5 @@
 package com.chuanghai.repair.mapper;
 
-import com.chuanghai.repair.entity.RepairsAdvice;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

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

@@ -26,4 +26,10 @@ public interface RepairsStudentMapper {
      * @param repairsStudent
      */
     void updateStudent(List<RepairsStudent> repairsStudent);
+
+    /**
+     * 通过学号逻辑删除学生
+     * @param studentId
+     */
+    void updateStudentStatus(String studentId);
 }

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

@@ -1,10 +0,0 @@
-package com.chuanghai.repair.service;
-
-/**
- * @Author: bingo
- * @Date: 2022/2/23 星期三 17:25
- * @Description: com.chuanghai.repair.service
- * @version: 1.0
- */
-public interface RepairsAdviceService {
-}

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

@@ -10,7 +10,7 @@ import java.util.List;
  * @Description: com.chuanghai.repair.service
  * @version: 1.0
  */
-public interface RepairsBuildRoomService {
+public interface RepairsBuildFloorRoomService {
 
     /**
      * 查询所有宿舍信息

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

@@ -20,7 +20,7 @@ public interface RepairsOrderService {
      * @return
      * @throws Exception
      */
-    PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum,String tody, String tomorrow, String status) throws Exception;
+    PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, Integer pageSize, String tody, String tomorrow, String status) throws Exception;
 
     /**
      * 通过订单ID修改订单评价
@@ -81,7 +81,7 @@ public interface RepairsOrderService {
      * @param campus
      * @return
      */
-    List<RepairsOrder> queryAllOrderById(String studentId,String workId,String campus)throws  Exception;
+    PageInfo<RepairsOrder> queryAllOrderById(Integer pageNum, Integer pageSize, String studentId,String workId,String campus)throws  Exception;
 
     /**
      * 订单修改状态   已完成 退单状态
@@ -103,12 +103,8 @@ public interface RepairsOrderService {
      * 查询所有评价的订单信息
      * @return
      */
-    PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum)throws Exception;
+    PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum, Integer pageSize)throws Exception;
+
 
 
-    /**
-     * 移动端查询所有用户评价的订单信息
-     * @return
-     */
-    List<RepairsOrder> queryAllOrderUserAdvice()throws Exception;
 }

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

@@ -31,4 +31,11 @@ public interface RepairsStudentService {
      * @param
      */
     void updateStudent(List<RepairsStudent> repairsStudent)throws Exception;
+
+
+    /**
+     * 通过学号逻辑删除学生
+     * @param studentId
+     */
+    void updateStudentStatus(String studentId) throws Exception;
 }

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

@@ -70,5 +70,5 @@ public interface RepairsWorkService  {
      * @return
      * @throws Exception
      */
-    PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) throws Exception;
+    PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum, Integer pageSize) throws Exception;
 }

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

@@ -1,22 +0,0 @@
-package com.chuanghai.repair.service.ServiceImpl;
-
-import com.chuanghai.repair.mapper.RepairsAdviceMapper;
-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
- * @Description: com.chuanghai.repair.service.ServiceImpl
- * @version: 1.0
- */
-@Service("repairsAdviceService")
-public class RepairsAdviceServiceImpl implements RepairsAdviceService {
-
-    @Resource
-    private RepairsAdviceMapper repairsAdviceMapper;
-
-}

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

@@ -15,7 +15,7 @@ import java.util.List;
  * @version: 1.0
  */
 @Service("repairsBuildRoomService")
-public class RepairsBuildRoomServiceImpl implements RepairsBuildRoomService {
+public class RepairsBuildFloorRoomServiceImpl implements RepairsBuildRoomService {
 
     @Resource
     private RepairsBuildRoomMapper repairsBuildRoomMapper;

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

@@ -7,6 +7,7 @@ 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;
 
@@ -33,9 +34,7 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @throws Exception
      */
     @Override
-    public PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, String tody, String tomorrow, String status) throws Exception {
-        pageNum = pageNum == null ? 1 : pageNum;
-        Integer pageSize = 5;
+    public PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, Integer pageSize, String tody, String tomorrow, String status) throws Exception {
         PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
         List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByDate(tody, tomorrow, status);
         PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
@@ -119,8 +118,11 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @return
      */
     @Override
-    public List<RepairsOrder> queryAllOrderById(String studentId, String workId, String campus) throws Exception {
-        return repairsOrderMapper.queryAllOrderById(studentId, workId, campus);
+    public PageInfo<RepairsOrder> queryAllOrderById(Integer pageNum, Integer pageSize, String studentId, String workId, String campus) throws Exception {
+        PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
+        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderById(studentId, workId, campus);
+        PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
+        return pageInfo;
     }
 
 
@@ -155,22 +157,12 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @return
      */
     @Override
-    public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum) throws Exception {
-        pageNum = pageNum == null ? 1 : pageNum;
-        Integer pageSize = 5;
+    public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum, Integer pageSize) throws Exception {
         PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
         List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice();
         PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
         return pageInfo;
     }
 
-    /**
-     * 移动端查询所有用户评价的订单信息
-     *
-     * @return
-     */
-    @Override
-    public List<RepairsOrder> queryAllOrderUserAdvice() throws Exception {
-        return repairsOrderMapper.queryAllOrderByAdvice();
-    }
+
 }

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

@@ -55,4 +55,14 @@ public class RepairsStudentServiceImpl implements RepairsStudentService {
     public void updateStudent(List<RepairsStudent> repairsStudent) throws Exception {
         repairsStudentMapper.updateStudent(repairsStudent);
     }
+
+    /**
+     * 查询指定学号的学生
+     * @param studentId
+     * @return
+     */
+    @Override
+    public void updateStudentStatus(String studentId) throws Exception {
+        repairsStudentMapper.updateStudentStatus(studentId);
+    }
 }

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

@@ -97,9 +97,7 @@ public class RepairsWorkServiceImpl implements RepairsWorkService {
     }
 
     @Override
-    public PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) throws Exception {
-        pageNum = pageNum == null ? 1 : pageNum;
-        Integer pageSize = 5;
+    public PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum, Integer pageSize) throws Exception {
         PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
         List<RepairsWork> repairsWorkList = repairsWorkMapper.queryAllWorkStatus();
         PageInfo<RepairsWork> pageInfo = new PageInfo<>(repairsWorkList);

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

@@ -4,6 +4,8 @@ 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;
@@ -15,6 +17,7 @@ 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;
@@ -37,6 +40,9 @@ public class CreateTokenUtil {
     private static final String TOKEN_SECRET = "ZCfasfhuaUUHufguGuwu2020BQWE";
 
 
+    private static String app_key;
+    private static String app_secret;
+    private static String ocode;
 
     /**
      * 数据加密生成token
@@ -95,8 +101,8 @@ public class CreateTokenUtil {
 
         try {
 
-            String app_key = "EE28EE2C93296F4E";
-            String app_secret = "5071958561AA629530AAA31503088330";
+           // 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
@@ -134,6 +140,15 @@ public class CreateTokenUtil {
      */
 
 
+public String getAccessTokenGlobalA(String appKey, String appSecret, String oCode){
+    app_key = appKey;
+    app_secret = appSecret;
+    ocode = oCode;
+
+    String accessTokenGlobal = getAccessTokenGlobal();
+
+    return accessTokenGlobal;
+}
 
     //    @Scheduled(cron = "0 */1 * * * ?")
     @Scheduled(cron = "0 59 0/1 * * ?") //    每隔 1hour59minutes 执行一次刷新access_token
@@ -141,11 +156,11 @@ public class CreateTokenUtil {
         String access_token_global = "";
         try {
 
-            String app_key = "EE28EE2C93296F4E";
-            String app_secret = "5071958561AA629530AAA31503088330";
+            //String app_key = "EE28EE2C93296F4E";
+           // String app_secret = "5071958561AA629530AAA31503088330";
             String grant_type = "client_credentials";
             String scope = "base";
-            String ocode = "1015730314";
+           // 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);

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

@@ -12,22 +12,23 @@ public class SubUtil {
     public static String  subBefore(String str){
 
         //截取_之前字符串
-        String str1 = str.substring(0, str.indexOf("_"));
+        String str1 = str.substring(0, str.lastIndexOf(";"));
         return str1;
     }
 
     //java截取某个字符之后的字符串
     public static String subAfter(String str){
 
-        String str1 = str.substring(0, str.indexOf("_"));
-        String str2 = str.substring(str1.length()+1, str.length());
-        return str2;
+        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";
-        String str1 = str.substring(0, str.indexOf("_"));
+        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(str2);
+        System.out.println(str1);
     }
 }

src/main/resources/application.yml

@@ -16,12 +16,6 @@ spring:
       name: admin
       password: 123456
 
-# img
-img:
-  # 图片保存地址
-  saveLocation: E:\devImg\repair\
-  # 图片预览地址
-  showHost: http://localhost/dev-img/
 
 #数据库方言
   jpa:
@@ -34,5 +28,19 @@ mybatis:
 
 
 
+# 图片地址
+img:
+  # 图片保存地址
+  saveLocation: E:\devImg\repair\
+  # 图片预览地址
+  showHost: http://localhost/dev-img/
 
+#微校相关配置
+weixiao:
+  app_key: EE28EE2C93296F4E
+  app_secret: 5071958561AA629530AAA31503088330
+  ocode: 1015730314
+  title: 寝室维修通知
+  content: 同学你好，你的寝室报修单已被维修师傅接单，维修师傅将于半小时后上门维修；请合理安排时间，谢谢合作。
+  sender: 寝室管理办公室
 

src/main/resources/mapper/RepairsAdviceMapper.xml

@@ -1,13 +0,0 @@
-<?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.RepairsAdviceMapper">
-    <resultMap id="BaseResultMap" type="com.chuanghai.repair.entity.RepairsAdvice">
-        <!--
-          WARNING - @mbg.generated
-        -->
-        <id column="advice_id" property="adviceId" jdbcType="INTEGER"/>
-        <result column="advice_options" property="adviceOptions" jdbcType="VARCHAR"/>
-        <result column="student_id" property="studentId" jdbcType="VARCHAR"/>
-        <result column="order_id" property="orderId" jdbcType="VARCHAR"/>
-    </resultMap>
-</mapper>

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -64,7 +64,7 @@
                     and od.order_status = #{status}
                 </if>
             </trim>
-                order by od.order_commit_time desc
+                order by od.order_commit_time desc, fa.fault_level desc
         </select>
 
     <!--    通过ID查询订单信息-->
@@ -120,8 +120,6 @@
 
 <!--    管理员手动派单 同时修改两个参数-->
     <update id="updateRepairsOrderBath" parameterType="java.util.List" >
-
-
         update repairs_order
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="order_status=case" suffix="end,">

src/main/resources/mapper/RepairsStudentMapper.xml

@@ -16,54 +16,84 @@
         <result column="student_status" property="studentStatus" jdbcType="VARCHAR"/>
         <result column="student_campus" property="studentCampus" jdbcType="VARCHAR"/>
         <result column="card_number" property="cardNumber" jdbcType="VARCHAR"/>
+        <result column="student_update_status" property="studentUpdateStatus" jdbcType="VARCHAR"/>
     </resultMap>
-<!--    新增学生信息-->
+    <!--    新增学生信息-->
     <insert id="insertStudent" parameterType="com.chuanghai.repair.entity.RepairsStudent">
-        insert into repairs_student values(#{studentId},#{studentName},#{studentSex},#{studentPhone},#{studentOtherPhone},
-                        #{studentClazz},#{dormNumber},#{studentDormitory},#{studentStatus},#{studentCampus},#{cardNumber})
+        insert into repairs_student
+        values(#{studentId},#{studentName},#{studentSex},#{studentPhone},#{studentOtherPhone},
+        #{studentClazz},#{dormNumber},#{studentDormitory},#{studentStatus},#{studentCampus},#{cardNumber})
     </insert>
 
-<!--    查询指定学号-->
+    <!--    查询指定学号-->
     <select id="queryByStudentId" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select * from  repairs_student where student_id = #{studentId}
+        select * from repairs_student where student_id = #{studentId}
     </select>
-<!--    更新学生信息-->
-    <update id="updateStudent" parameterType="java.util.List" >
+    <!--    更新学生信息-->
+    <update id="updateStudent" parameterType="java.util.List">
         update repairs_student
         <trim prefix="set" suffixOverrides=",">
             <trim prefix="student_name=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.studentName}
+                    <if test="item.studentName!='' and item.studentName!=null">
+                        when student_id = #{item.studentId} then #{item.studentName}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="student_sex=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.studentSex}
+                    <if test="item.studentSex!='' and item.studentSex!=null">
+                        when student_id = #{item.studentId} then #{item.studentSex}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="student_phone=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.studentPhone}
+                    <if test="item.studentPhone!='' and item.studentPhone!=null">
+                        when student_id = #{item.studentId} then #{item.studentPhone}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="student_other_phone=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.studentOtherPhone}
+                    <if test="item.studentOtherPhone!='' and item.studentOtherPhone!=null">
+                        when student_id = #{item.studentId} then #{item.studentOtherPhone}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="student_clazz=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.studentClazz}
+                    <if test="item.studentClazz!='' and item.studentClazz!=null">
+                        when student_id = #{item.studentId} then #{item.studentClazz}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="dorm_number=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.dormNumber}
+                    <if test="item.dormNumber!='' and item.dormNumber!=null">
+                        when student_id = #{item.studentId} then #{item.dormNumber}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="student_dormitory=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    <if test="item.studentDormitory!='' and item.studentDormitory!=null">
+                        when student_id = #{item.studentId} then #{item.studentDormitory}
+                    </if>
                 </foreach>
             </trim>
             <trim prefix="student_campus=case" suffix="end,">
                 <foreach collection="list" item="item" index="index">
-                    when student_id = #{item.studentId} then #{item.studentCampus}
+                    <if test="item.studentCampus!='' and item.studentCampus!=null">
+                        when student_id = #{item.studentId} then #{item.studentCampus}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="student_update_status=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    <if test="item.studentUpdateStatus!='' and item.studentUpdateStatus!=null">
+                        when student_id = #{item.studentId} then #{item.studentUpdateStatus}
+                    </if>
                 </foreach>
             </trim>
         </trim>
@@ -73,4 +103,9 @@
             #{item.studentId,jdbcType=VARCHAR}
         </foreach>
     </update>
+
+<!--    逻辑删除信息-->
+    <select id="updateStudentStatus" parameterType="java.lang.String">
+        update repairs_student set student_status = "1" where student_id = #{studentId}
+    </select>
 </mapper>