接口新增字段，startTime

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/meeting/feign/RemoteMeetingService.java

@@ -55,5 +55,5 @@ public interface RemoteMeetingService {
 
     @GetMapping("/meeting/inner-api/recent/{deptId}/{dateStr}")
     @ResponseBody
-    public List<JSONObject> recent(@PathVariable(value = "deptId") Long deptId, @PathVariable(value = "dateStr") String dateStr, @RequestParam(value = "roomId", required = false) Long roomId, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) ;
+    public List<JSONObject> recent(@PathVariable(value = "deptId") Long deptId, @PathVariable(value = "dateStr") String dateStr, @RequestParam(value = "roomId", required = false) Long roomId,@RequestParam(value = "startTime", required = false) String startTime, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source) ;
 }

xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/meeting/feign/factory/RemoteMeetingFallbackFactory.java

@@ -68,7 +68,7 @@ public class RemoteMeetingFallbackFactory implements FallbackFactory<RemoteMeeti
             }
 
             @Override
-            public List<JSONObject> recent(Long deptId, String dateStr, Long roomId, Long enterpriseId, String sourceName, String source) {
+            public List<JSONObject> recent(Long deptId, String dateStr, Long roomId, String startTime, Long enterpriseId, String sourceName, String source) {
                 return null;
             }
         };

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){
+    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){
         DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId);
 
         R<DmDigitalmanExtPo> extR = digitalmanService.selectExtByDeviceId(devId,vo.getTenantId(),vo.getSourceSlave(), SecurityConstants.INNER);
@@ -154,7 +154,7 @@ public class DmMeetingApiController extends BaseApiController {
             extPo = extR.getData();
         }
         if (extPo != null) {
-            List<JSONObject> result = remoteMeetingService.recent(extPo.getDeptId(),dateStr, roomId, vo.getTenantId(),vo.getSourceSlave(), SecurityConstants.INNER);
+            List<JSONObject> result = remoteMeetingService.recent(extPo.getDeptId(),dateStr, roomId, startTime, vo.getTenantId(),vo.getSourceSlave(), SecurityConstants.INNER);
             return R.ok(result);
         } else {
             return R.fail("未找到设备信息");

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

@@ -381,7 +381,7 @@ public class DmMeetingInnerApiController extends BaseApiController {
     @InnerAuth
     @GetMapping("/recent/{deptId}/{dateStr}")
     @ResponseBody
-    public List<JSONObject> recent(@PathVariable(value = "deptId") Long deptId,@PathVariable(value = "dateStr") String dateStr,@RequestParam(value = "roomId", required = false) Long roomId, HttpServletRequest request) {
+    public List<JSONObject> recent(@PathVariable(value = "deptId") Long deptId,@PathVariable(value = "dateStr") String dateStr,@RequestParam(value = "roomId", required = false) Long roomId,@RequestParam(value = "startTime", required = false) String startTime, HttpServletRequest request) {
 
         List<DmMeetingOrdersPo> list = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
@@ -404,14 +404,13 @@ public class DmMeetingInnerApiController extends BaseApiController {
         //过滤掉今天的已经过去的预约记录，并按开始时间进行排序
         list = list.stream().filter(t->DateUtils.formatDate(t.getOrderDate(), "yyyy-MM-dd").compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd"))>0 || (DateUtils.formatDate(t.getOrderDate(), "yyyy-MM-dd").compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd"))==0 && DateUtils.formatDate(t.getStartTime(), "HH:mm").compareTo(DateUtils.formatDate(new Date(), "HH:mm"))>0)).sorted(Comparator.comparing(po -> DateUtils.formatDate(po.getStartTime(), "HH:mm"))).collect(Collectors.toList());
 
-        /*List<String> times = new ArrayList<>();
-        for  (int i = 0 ;i<list.size();i++){
-            times.add(DateUtils.formatDate(list.get(i).getStartTime(),"HH:mm"));
-            times.add(DateUtils.formatDate(list.get(i).getEndTime(),"HH:mm"));
-        }*/
 
         //获得当前时间开始最近的整点，或者半点
         String currentStr = "08:00";
+        if (StringUtils.isNotEmpty(startTime)) {
+            currentStr = startTime;
+        }
+
         if (dateStr.compareTo(DateUtils.formatDate(new Date(), "yyyy-MM-dd")) == 0) {
             LocalTime currentTime = LocalTime.now();
             if (currentTime.getMinute() >= 30) {