接口新增字段，startTime

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingApiController.java

@@ -145,7 +145,7 @@ public class DmMeetingApiController extends BaseApiController {
 
     @GetMapping(value = "/recent/{devId}/{dateStr}")
     @ResponseBody
-    public R<List<JSONObject>> roomList(@PathVariable(value = "devId") String devId, @PathVariable(value = "dateStr") String dateStr, @RequestParam(value = "roomId", required = false) Long roomId, @RequestParam(value = "startTime", required = false) String startTime){
+    public R<List<JSONObject>> ableOrderList(@PathVariable(value = "devId") String devId, @PathVariable(value = "dateStr") String dateStr, @RequestParam(value = "roomId", required = false) Long roomId, @RequestParam(value = "startTime", required = false) String startTime){
         DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId);
 
         R<DmDigitalmanExtPo> extR = digitalmanService.selectExtByDeviceId(devId,vo.getTenantId(),vo.getSourceSlave(), SecurityConstants.INNER);

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/meeting/controller/api/DmMeetingInnerApiController.java

@@ -369,7 +369,11 @@ public class DmMeetingInnerApiController extends BaseApiController {
 
             if (i==objects.size() - 2) {
                 JSONObject json = new JSONObject();
-                json.put("startTime", DateUtils.formatDate(next.getEndTime(), "HH:mm"));
+                if (DateUtils.formatDate(next.getEndTime(), "HH:mm").compareTo(currentTime)>0) {
+                    json.put("startTime", DateUtils.formatDate(next.getEndTime(), "HH:mm"));
+                } else {
+                    json.put("startTime", currentTime);
+                }
                 json.put("endTime", 0);
                 json.put("roomId", current.getSpaceId());
                 freeTimeList.add(json);