1、实现动态配置

2、实现订单的分页查询

pom.xml

@@ -189,6 +189,16 @@
             <artifactId>spring-cloud-commons</artifactId>
             <version>2.2.3.RELEASE</version>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.github.github.pagehelper</groupId>-->
+<!--            <artifactId>pagehelper</artifactId>-->
+<!--            <version>5.0.1</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.2.10</version>
+        </dependency>
 
 
     </dependencies>

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

@@ -0,0 +1,19 @@
+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 星期三 15:11
+ * @Description: 图片配置
+ * @version: 1.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "img")
+@Data
+public class MyImgConfig {
+    private String saveLocation;
+    private String showHost;
+}

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

@@ -7,6 +7,7 @@ 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;
@@ -38,7 +39,6 @@ import java.util.stream.Collectors;
 @RequestMapping("/auto")
 public class AutoSendOrderCentroller implements ApplicationListener<ContextRefreshedEvent> {
 
-
     @Resource(name = "repairsOrderService")
     private RepairsOrderService repairsOrderService;
 
@@ -51,7 +51,8 @@ public class AutoSendOrderCentroller implements ApplicationListener<ContextRefre
 
     @Override
     public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) {
-        String accessTokenGlobal = CreateTokenUtil.getAccessTokenGlobal();
+        //String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobalA(weixiaoConfig.getApp_key(),weixiaoConfig.getApp_secret(),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 过期
@@ -60,9 +61,11 @@ public class AutoSendOrderCentroller implements ApplicationListener<ContextRefre
 
     }
 
+ //   @Scheduled(cron = "0 0/30 * * * ?") //    0 0/30 * * * ?    30分钟调用一次
     @Scheduled(cron = "0 0/30 * * * ?") //    0 0/30 * * * ?    30分钟调用一次
     public void autoQueryOrder(){
-        String accessTokenGlobal = CreateTokenUtil.getAccessTokenGlobal();
+       // String accessTokenGlobal = new CreateTokenUtil().getAccessTokenGlobalA(weixiaoConfig.getApp_key(),weixiaoConfig.getApp_secret(),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 过期
@@ -72,6 +75,7 @@ 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());
 
             List<RepairsOrder> orderList = repairsOrderService.queryByTime(systemTime, changeTime);
@@ -83,7 +87,7 @@ public class AutoSendOrderCentroller implements ApplicationListener<ContextRefre
             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("cards", idList);

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.chuanghai.repair.entity.*;
 import com.chuanghai.repair.service.RepairsAdminService;
-import com.chuanghai.repair.service.RepairsOrderService;
 import com.chuanghai.repair.service.RepairsStudentService;
 import com.chuanghai.repair.service.RepairsWorkService;
 import com.chuanghai.repair.utils.CreateTokenUtil;
@@ -91,11 +90,17 @@ public class LoginController {
         return ReturnValueUtil.returnString(workIdToken);
     }
 
+    @GetMapping(value = "getInfo")
+    public String getInfo(String wxcode,String state){
+        System.out.println(wxcode);
+        return "";
+    }
+
     @ApiIgnore  //使该接口隐藏
     @ApiOperation("获取学生CardNumber")
     @GetMapping("/getCardNumber")
-    public JSONObject getCardNumber(String wxcode, String state) {
-        JSONObject jsonObject = new JSONObject();
+    public String  getCardNumber(String wxcode, String state) {
+
         String cardNumberToken = "";
         String accessToken = "";
         try {
@@ -182,17 +187,17 @@ public class LoginController {
                     studentPhone, studentOtherPhone, studentClazz, dormNumber,
                     studentDormitory, studentStatus, studentCampus, cardNumber);
             RepairsStudent student = repairsStudentService.queryByStudentId(studentId);
+            System.out.println(student);
             if (student == null) {
                 repairsStudentService.insertStudent(repairsStudent);
             }
-            jsonObject.put("cardNumber",cardNumber);
-
+            cardNumberToken = CreateTokenUtil.getToken(cardNumber);
 
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return jsonObject;
+        return cardNumberToken;
     }
 
 

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

@@ -6,6 +6,7 @@ import com.chuanghai.repair.utils.CreateTokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -53,6 +54,7 @@ public class NoticeController {
 
     @ApiOperation("发布公告")
     @PostMapping(value = "/releaseNotice")
+    @CrossOrigin
     public RepairsNotice releaseNotice() {
         RepairsNotice repairsNotice = null;
         try {

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

@@ -1,5 +1,6 @@
 package com.chuanghai.repair.controller;
 
+import com.chuanghai.repair.config.MyImgConfig;
 import com.chuanghai.repair.entity.RepairsFault;
 import com.chuanghai.repair.entity.RepairsOrder;
 import com.chuanghai.repair.entity.RepairsStudent;
@@ -9,10 +10,11 @@ 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.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.http.HttpRequest;
+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.RestController;
@@ -44,6 +46,9 @@ public class OrderController {
     @Resource(name = "repairsWorkService")
     private RepairsWorkService repairsWorkService;
 
+    @Resource
+    private MyImgConfig myImgConfig;
+
 
     //------------------------------------------- PC端管理员操作-------------------------------------------
 
@@ -53,8 +58,10 @@ public class OrderController {
      */
     @ApiOperation("PC端查询订单")
     @PostMapping(value = "/queryAllOrderByDate")
-    public ReturnValueUtil queryAllOrderByDate(@ApiParam(name = "查询日期") String time) {
-        List<RepairsOrder> repairsOrder = null;
+    public PageInfo<RepairsOrder> queryAllOrderByDate(@ApiParam(name = "查询日期") String time,
+                                                      Integer pageNum) {
+        pageNum = pageNum == null ? 1 : pageNum;
+        PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
             String tody = "";
             String tomorrow = "";
@@ -75,11 +82,12 @@ public class OrderController {
                 tomorrow = sdf.format(calendar.getTime());
 
             }
-            repairsOrder = repairsOrderService.queryAllOrderByDate(tody, tomorrow, status);
+            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, tody, tomorrow, status);
+
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ReturnValueUtil.returnObject(repairsOrder);
+        return pageInfoOrder;
     }
 
     /**
@@ -88,22 +96,39 @@ public class OrderController {
      */
     @ApiOperation("PC端派送订单查询")
     @PostMapping(value = "/queryAllOrderByStatus")
-    public ReturnValueUtil queryAllOrderByDateStatus() {
-        List<RepairsOrder> repairsOrder = null;
+    public PageInfo<RepairsOrder> queryAllOrderByDateStatus(Integer pageNum) {
+        pageNum = pageNum == null ? 1 : pageNum;
+        PageInfo<RepairsOrder> pageInfoOrder = null;
         try {
-                String status = "0";
-                repairsOrder = repairsOrderService.queryAllOrderByDate(null, null, status);
+            String status = "0";
+            pageInfoOrder = repairsOrderService.queryAllOrderByDate(pageNum, null, null, status);
 
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ReturnValueUtil.returnObject(repairsOrder);
+        return pageInfoOrder;
     }
 
-
+    /**
+     * @param
+     * @return
+     */
+    @ApiOperation("PC端意见投诉查询")
+    @PostMapping(value = "/queryAllOrderByAdvice")
+    public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum) {
+        pageNum = pageNum == null ? 1 : pageNum;
+        PageInfo<RepairsOrder> pageInfoOrder = null;
+        try {
+            pageInfoOrder = repairsOrderService.queryAllOrderByAdvice(pageNum);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return pageInfoOrder;
+    }
 
     /**
-     *  待接单 orderStatus = 1  须在维修工同意之后变为已接单
+     * 待接单 orderStatus = 1  须在维修工同意之后变为已接单
+     *
      * @param orderId
      * @param
      * @return
@@ -115,7 +140,7 @@ public class OrderController {
         Boolean flag = Boolean.FALSE;
         try {
 
-            if (orderId != "" && orderId != null && workId != null ) {
+            if (orderId != "" && orderId != null && workId != null) {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 Calendar calendar = Calendar.getInstance();
                 Date time = calendar.getTime();
@@ -156,7 +181,7 @@ public class OrderController {
             @ApiParam(name = "退回理由", required = true) String orderBack) {
         Boolean flag = Boolean.FALSE;
         try {
-            if(orderId != "" && orderId != null){
+            if (orderId != "" && orderId != null) {
                 //当workId不为null时 数据库不会执行更新workId的sql
                 RepairsWork repairsWork = new RepairsWork();
                 RepairsOrder repairsOrder = new RepairsOrder();
@@ -264,6 +289,9 @@ public class OrderController {
         try {
             if (orderId != "" && orderId != null) {
                 repairsOrder = repairsOrderService.queryByOrderId(orderId);
+                String imageName = repairsOrder.getOrderImages();
+                if (StringUtils.hasText(imageName))
+                repairsOrder.setOrderImages(myImgConfig + imageName);
             }
 
         } catch (Exception e) {
@@ -311,7 +339,7 @@ public class OrderController {
             String orderImages = repairsOrder.getOrderImages();
             //保存图片的路径（这是存在我项目中的images下了，你们可以设置路径）
             // String filePath="E:\\springboot\\src\\main\\resources\\static\\images";
-            String filePath = "C:\\Users\\Administrator\\Desktop\\学校报修系统\\code\\repair_reporting_system_api\\src\\main\\resources\\static\\images";
+            String filePath = myImgConfig.getSaveLocation();
             //生成新文件名字
             String newFileName = UUID.randomUUID() + originalFilename;
             // 封装上传文件位置的全路径
@@ -335,6 +363,24 @@ public class OrderController {
         return ReturnValueUtil.returnBoolean(flag);
     }
 
+
+    /**
+     * 移动端查询所有用户评价的订单信息
+     * @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
      *
@@ -352,7 +398,7 @@ public class OrderController {
             RepairsWork repairsWork = new RepairsWork();
             repairsWork.setWorkId(1);
 
-            if (orderId != "" && orderId != null ) {
+            if (orderId != "" && orderId != null) {
                 RepairsOrder repairsOrder = new RepairsOrder(orderId, null, null, null,
                         null, null, null, "3", null,
                         null, null, null, repairsWork, null, null);
@@ -398,7 +444,6 @@ public class OrderController {
     }
 
 
-
     /**
      * 修改订单状态  维修工拒绝订单   orderStatus = 0
      *
@@ -409,16 +454,19 @@ public class OrderController {
      */
     @ApiOperation("维修工接受订单")
     @PostMapping(value = "/updateOrderAccept")
-    public ReturnValueUtil updateOrderAccept(@ApiParam(name = "订单ID", required = true) String orderId) {
+    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) {
                 //当workId不为null时 数据库不会执行更新workId的sql
                 RepairsWork repairsWork = new RepairsWork();
                 repairsWork.setWorkId(1);
-
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                //传入时间就设置为当天时间
+                Date completeTimeDate = sdf.parse(completeTime);
                 RepairsOrder repairsOrder = new RepairsOrder(orderId, null, null, null,
-                        null, null, null, "2", null,
+                        completeTimeDate, null, null, "2", null,
                         null, null, null, repairsWork, null, null);
                 ArrayList<RepairsOrder> orderArrayList = new ArrayList<>();
                 orderArrayList.add(repairsOrder);

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

@@ -1,8 +1,10 @@
 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;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,6 +32,7 @@ public class WorkController {
     /**
      * 维修工注册(先判断数据库中是否有同名同手机号码的人《认为是同一人》)
      * 同一人就无法注册，不同的人就可以完成注册
+     *
      * @param workName
      * @param workPassword
      * @param workPhone
@@ -38,47 +41,65 @@ public class WorkController {
      */
     @ApiOperation("维修工注册")
     @PostMapping(value = "/insertWork")
-    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){
-        Boolean flag =Boolean.FALSE;
+    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) {
+        Boolean flag = Boolean.FALSE;
         try {
-            if(workName != "" && workName!=null && workPhone != "" && workPhone != null){
-                RepairsWork repairsWork = new RepairsWork(null,workName,workPassword,workPhone,"1","0",workCampus);
+            if (workName != "" && workName != null && workPhone != "" && workPhone != null) {
+                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())){
-                    }else {  //继续注册
+                    if (repairsWork.getWorkName().equals(testWork.getWorkName()) &&
+                            repairsWork.getWorkPhone().equals(testWork.getWorkPhone())) {
+                    } else {  //继续注册
                         repairsWorkService.insertWork(repairsWork);
                         flag = Boolean.TRUE;
                     }
-                }else {
+                } else {
                     repairsWorkService.insertWork(repairsWork);
                     flag = Boolean.TRUE;
                 }
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return ReturnValueUtil.returnBoolean(flag);
     }
 
     @ApiOperation("维修工删除")
-    @PostMapping(value ="updateWorkStatus")
-    public  ReturnValueUtil updateWorkStatus(@ApiParam(name = "维修工ID", required = true)String workId){
+    @PostMapping(value = "updateWorkStatus")
+    public ReturnValueUtil updateWorkStatus(@ApiParam(name = "维修工ID", required = true) String workId) {
         Boolean flag = Boolean.FALSE;
         try {
-            if(workId != "" && workId != null){
+            if (workId != "" && workId != null) {
                 repairsWorkService.updateWorkStatus(workId);
                 flag = Boolean.TRUE;
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return ReturnValueUtil.returnBoolean(flag);
     }
+
+    /**
+     * 查询所有在职维修工
+     * @param pageNum
+     * @return
+     */
+    @ApiOperation("维修工查询")
+    @PostMapping(value = "queryAllWorkStatus")
+    public PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) {
+        pageNum = pageNum == null ? 1 : pageNum;
+        PageInfo<RepairsWork> pageInfoWork = null;
+        try {
+            pageInfoWork = repairsWorkService.queryAllWorkStatus(pageNum);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return pageInfoWork;
+    }
 }

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

@@ -63,6 +63,14 @@ public class RepairsStudent {
     private String dormNumber;
 
     /**
+     * 学生校区0（南校区）1（北校区）
+     */
+    @ApiModelProperty(value ="学生校区0（南校区）1（北校区）" ) //key:campus，value:
+    @Column(name = "student_campus")
+    private String studentCampus;
+
+
+    /**
      * 宿舍ID拼接
      */
     @ApiModelProperty(value = "宿舍ID拼接")   //key:dorm_number，value:15栋413
@@ -76,12 +84,7 @@ public class RepairsStudent {
     @Column(name = "student_status")
     private String studentStatus;
 
-    /**
-     * 学生校区0（南校区）1（北校区）
-     */
-    @ApiModelProperty(value ="学生校区0（南校区）1（北校区）" ) //key:campus，value:
-    @Column(name = "student_campus")
-    private String studentCampus;
+
 
 
     /**

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

@@ -1,6 +1,7 @@
 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;
@@ -15,7 +16,7 @@ public interface RepairsOrderMapper  {
      * @return
      * @throws Exception
      */
-    List<RepairsOrder> queryAllOrderByDate(String tody,String tomorrow,String status);
+    List<RepairsOrder> queryAllOrderByDate( String tody, String tomorrow, String status);
 
 
     /**
@@ -89,4 +90,10 @@ public interface RepairsOrderMapper  {
      */
     List<RepairsOrder> queryByTime(String systemTime,String changeTime);
 
+    /**
+     * 查询所有评价的订单信息
+     * @return
+     */
+    List<RepairsOrder> queryAllOrderByAdvice();
+
 }

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

@@ -57,5 +57,10 @@ public interface RepairsWorkMapper {
      */
     RepairsWork queryByWorkId(String workId) throws Exception;
 
-
+    /**
+     * 查询所有在职维修工
+     * @return
+     * @throws Exception
+     */
+    List<RepairsWork> queryAllWorkStatus() throws Exception;
 }

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

@@ -1,6 +1,7 @@
 package com.chuanghai.repair.service;
 
 import com.chuanghai.repair.entity.RepairsOrder;
+import com.github.pagehelper.PageInfo;
 
 import java.util.HashMap;
 import java.util.List;
@@ -19,7 +20,7 @@ public interface RepairsOrderService {
      * @return
      * @throws Exception
      */
-    List<RepairsOrder> queryAllOrderByDate(String tody,String tomorrow,String status) throws Exception;
+    PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum,String tody, String tomorrow, String status) throws Exception;
 
     /**
      * 通过订单ID修改订单评价
@@ -97,4 +98,17 @@ public interface RepairsOrderService {
      * @return
      */
     List<RepairsOrder> queryByTime(String systemTime,String changeTime)throws Exception;
+
+    /**
+     * 查询所有评价的订单信息
+     * @return
+     */
+    PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum)throws Exception;
+
+
+    /**
+     * 移动端查询所有用户评价的订单信息
+     * @return
+     */
+    List<RepairsOrder> queryAllOrderUserAdvice()throws Exception;
 }

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

@@ -1,6 +1,7 @@
 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;
 
@@ -63,4 +64,11 @@ public interface RepairsWorkService  {
      * @throws Exception
      */
     RepairsWork queryByWorkId(String workId) throws Exception;
+
+    /**
+     * 查询所有在职维修工
+     * @return
+     * @throws Exception
+     */
+    PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) throws Exception;
 }

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

@@ -5,6 +5,8 @@ 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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,8 +32,13 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
      * @throws Exception
      */
     @Override
-    public List<RepairsOrder> queryAllOrderByDate(String tody, String tomorrow, String status) throws Exception {
-        return repairsOrderMapper.queryAllOrderByDate(tody, tomorrow, status);
+    public PageInfo<RepairsOrder> queryAllOrderByDate(Integer pageNum, String tody, String tomorrow, String status) throws Exception {
+        pageNum = pageNum==null ? 1 : pageNum;
+        Integer pageSize = 5;
+        PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
+        List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByDate(tody, tomorrow, status);
+        PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
+        return pageInfo;
     }
 
     /**
@@ -128,4 +135,26 @@ public class RepairsOrderServiceImpl implements RepairsOrderService {
    public List<RepairsOrder> queryByTime(String systemTime,String changeTime)throws Exception {
        return repairsOrderMapper.queryByTime(systemTime,changeTime);
    }
+
+
+    /**
+     * 查询所有评价的订单信息
+     * @return
+     */
+   public PageInfo<RepairsOrder> queryAllOrderByAdvice(Integer pageNum)throws Exception {
+       pageNum = pageNum==null ? 1 : pageNum;
+       Integer pageSize = 5;
+       PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
+       List<RepairsOrder> orderList = repairsOrderMapper.queryAllOrderByAdvice();
+       PageInfo<RepairsOrder> pageInfo = new PageInfo<>(orderList);
+       return pageInfo;
+    }
+
+    /**
+     * 移动端查询所有用户评价的订单信息
+     * @return
+     */
+   public List<RepairsOrder> queryAllOrderUserAdvice()throws Exception {
+       return repairsOrderMapper.queryAllOrderByAdvice();
+    }
 }

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

@@ -1,8 +1,11 @@
 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;
@@ -88,4 +91,14 @@ public class RepairsWorkServiceImpl implements RepairsWorkService  {
     public RepairsWork queryByWorkId(String workId) throws Exception {
         return repairsWorkMapper.queryByWorkId(workId);
     }
+
+    @Override
+    public PageInfo<RepairsWork> queryAllWorkStatus(Integer pageNum) throws Exception {
+        pageNum = pageNum==null ? 1 : pageNum;
+        Integer pageSize = 5;
+        PageHelper.startPage(pageNum, pageSize);//分页插件，专门用于myBatis分页
+        List<RepairsWork> repairsWorkList = repairsWorkMapper.queryAllWorkStatus();
+        PageInfo<RepairsWork> pageInfo = new PageInfo<>(repairsWorkList);
+        return pageInfo;
+    }
 }

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

@@ -38,7 +38,6 @@ public class CreateTokenUtil {
 
 
 
-
     /**
      * 数据加密生成token
      *
@@ -134,7 +133,9 @@ public class CreateTokenUtil {
      * @return
      */
 
-//    @Scheduled(cron = "0 */1 * * * ?")
+
+
+    //    @Scheduled(cron = "0 */1 * * * ?")
     @Scheduled(cron = "0 59 0/1 * * ?") //    每隔 1hour59minutes 执行一次刷新access_token
     public static String getAccessTokenGlobal() {
         String access_token_global = "";
@@ -175,6 +176,7 @@ public class CreateTokenUtil {
         return access_token_global;
     }
 
+
     /**
      * 微校小程序H5页面  通过 access_token 获取 用户信息
      *
@@ -246,7 +248,7 @@ public class CreateTokenUtil {
         String userId = "userId";
         String token = getToken(id);
      //   System.out.println(token);
-        String s = verify("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDY5MDE5NjYsInVzZXJJZCI6IjEwMDAifQ.qPBBNHebT4antVucjo9vBKezmOOflm1sIg1lEnbWppY", userId);
+        String s = verify("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2NDY5OTE2MjcsInVzZXJJZCI6IjM2MDcyMTE5OTgwMjE0MTYxOCJ9.YLVV0VSWvZl8DTZdYEIKr-5cKrU_8gl7na4VqhV8wwY", userId);
         System.out.println(s);
     }
 }

src/main/resources/application.yml

@@ -15,6 +15,14 @@ spring:
     user:
       name: admin
       password: 123456
+
+# img
+img:
+  # 图片保存地址
+  saveLocation: E:\devImg\repair\
+  # 图片预览地址
+  showHost: http://localhost/dev-img/
+
 #数据库方言
   jpa:
     database-platform: org.hibernate.dialect.MySQLDialect

src/main/resources/mapper/RepairsOrderMapper.xml

@@ -64,7 +64,7 @@
                     and od.order_status = #{status}
                 </if>
             </trim>
-                order by od.order_commit_time desc limit 100
+                order by od.order_commit_time desc
         </select>
 
     <!--    通过ID查询订单信息-->
@@ -195,6 +195,13 @@
                     </if>
                 </foreach>
             </trim>
+            <trim prefix="order_complete_time=case" suffix="end,">
+                <foreach collection="list" item="item" index="index">
+                    <if test="item.orderCompleteTime != null ">
+                        when order_id = #{item.orderId} then #{item.orderCompleteTime}
+                    </if>
+                </foreach>
+            </trim>
         </trim>
         where order_id in
         <foreach collection="list" index="index" item="item"
@@ -217,4 +224,37 @@
         where od.student_id = st.student_id
         and od.order_complete_time BETWEEN #{systemTime}  AND #{changeTime}
     </select>
+
+
+    <resultMap id="OrderAdviceMap" type="com.chuanghai.repair.entity.RepairsOrder" >
+        <id column="order_id" property="orderId" jdbcType="VARCHAR"/>
+        <result column="order_complete_time" property="orderCompleteTime" jdbcType="TIMESTAMP"/>
+        <result column="order_advice" property="orderAdvice" jdbcType="VARCHAR"/>
+        <!--        订单与学生之间是  N:1 关系-->
+        <association  property="repairsStudent"  javaType="com.chuanghai.repair.entity.RepairsStudent">
+            <id column="student_id" property="studentId"></id>
+            <result column="dorm_number" property="dormNumber" jdbcType="VARCHAR"/>
+        </association >
+        <!--        订单与维修工之间是  N:1 关系-->
+        <association  property="repairsWork"  javaType="com.chuanghai.repair.entity.RepairsWork">
+            <id column="work_id" property="workId"></id>
+            <result column="work_name" property="workName" jdbcType="VARCHAR"/>
+        </association >
+        <!--        订单与故障类型之间是  N:1 关系-->
+        <association  property="repairsFault"  javaType="com.chuanghai.repair.entity.RepairsFault">
+            <id column="fault_id" property="faultId"></id>
+            <result column="fault_name" property="faultName" jdbcType="VARCHAR"/>
+        </association >
+
+    </resultMap>
+
+<!--    订单意见投诉查询-->
+    <select id="queryAllOrderByAdvice" 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
+    </select>
 </mapper>

src/main/resources/mapper/RepairsWorkMapper.xml

@@ -68,4 +68,8 @@
     <select id="queryByWorkId" parameterType="java.lang.String" resultMap="AllRepairsWorkMap">
         select * from repairs_work where work_id = #{workId}
     </select>
+<!--    查询所有在职的维修工-->
+    <select id="queryAllWorkStatus" resultMap="AllRepairsWorkMap">
+        select * from repairs_work where work_status = 1
+    </select>
 </mapper>

src/test/java/com/chuanghai/RepairsApplicationTests.java

@@ -1,16 +1,7 @@
 package com.chuanghai;
 
-import com.chuanghai.repair.entity.RepairsOrder;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.UUID;
 
 @SpringBootTest
 class RepairsApplicationTests {