feat: 修复过滤为空集合时的bug

guzijian
1 parent 2b433ba0
Showing 2 changed files with 29 additions and 30 deletions
ruoyi-admin/src/main/java/com/ruoyi/scheduling/controller/RuleSchedulingController.java
ruoyi-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
@@ -3,6 +3,7 @@ package com.ruoyi.scheduling.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
  
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.pojo.vo.RuleSchedulingResponseVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,14 +26,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
  
 /**
  * 排版规则Controller
- * 
+ *
  * @author guzijian
  * @date 2023-08-04
  */
 @RestController
 @RequestMapping("/scheduling/scheduling")
-public class RuleSchedulingController extends BaseController
-{
+public class RuleSchedulingController extends BaseController {
     @Autowired
     private IRuleSchedulingService ruleSchedulingService;
  
@@ -41,12 +41,11 @@ public class RuleSchedulingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:list')")
     @GetMapping("/list")
-    public TableDataInfo list(RuleScheduling ruleScheduling)
-    {
+    public TableDataInfo list(RuleScheduling ruleScheduling) {
         startPage();
         List<RuleScheduling> list = ruleSchedulingService.selectRuleSchedulingList(ruleScheduling);
         List<RuleSchedulingResponseVo> vos = ruleSchedulingService.handleResponseRuleSchedulingList(list);
-        return getDataTable(vos);
+        return getDataTable(vos, new PageInfo(list).getTotal());
     }
  
     /**
@@ -54,8 +53,7 @@ public class RuleSchedulingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:list')")
     @GetMapping("/list/all")
-    public AjaxResult listAll(RuleScheduling ruleScheduling)
-    {
+    public AjaxResult listAll(RuleScheduling ruleScheduling) {
         return AjaxResult.success(ruleSchedulingService.selectRuleSchedulingListVo(ruleScheduling));
     }
  
@@ -64,8 +62,7 @@ public class RuleSchedulingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:list')")
     @GetMapping("/list/scheduling/{settingId}")
-    public AjaxResult getRuleSchedulingListVoBySettingId(@PathVariable("settingId") Integer settingId)
-    {
+    public AjaxResult getRuleSchedulingListVoBySettingId(@PathVariable("settingId") Integer settingId) {
         return AjaxResult.success(ruleSchedulingService.selectRuleSchedulingListVoBySettingId(settingId));
     }
  
@@ -76,8 +73,7 @@ public class RuleSchedulingController extends BaseController
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:export')")
     @Log(title = "排版规则", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, RuleScheduling ruleScheduling)
-    {
+    public void export(HttpServletResponse response, RuleScheduling ruleScheduling) {
         List<RuleScheduling> list = ruleSchedulingService.selectRuleSchedulingList(ruleScheduling);
         ExcelUtil<RuleScheduling> util = new ExcelUtil<RuleScheduling>(RuleScheduling.class);
         util.exportExcel(response, list, "排版规则数据");
@@ -88,8 +84,7 @@ public class RuleSchedulingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(ruleSchedulingService.selectRuleSchedulingById(id));
     }
  
@@ -99,8 +94,7 @@ public class RuleSchedulingController extends BaseController
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:add')")
     @Log(title = "排版规则", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody RuleScheduling ruleScheduling)
-    {
+    public AjaxResult add(@RequestBody RuleScheduling ruleScheduling) {
         return toAjax(ruleSchedulingService.insertRuleScheduling(ruleScheduling));
     }
  
@@ -110,8 +104,7 @@ public class RuleSchedulingController extends BaseController
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:edit')")
     @Log(title = "排版规则", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody RuleScheduling ruleScheduling)
-    {
+    public AjaxResult edit(@RequestBody RuleScheduling ruleScheduling) {
         return toAjax(ruleSchedulingService.updateRuleScheduling(ruleScheduling));
     }
  
@@ -120,9 +113,8 @@ public class RuleSchedulingController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('scheduling:scheduling:remove')")
     @Log(title = "排版规则", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(ruleSchedulingService.deleteRuleSchedulingByIds(ids));
     }
 }
@@ -474,6 +474,7 @@ public class ThreadJobService {
     private List<DriverScheduling> getBcList(Map<String, List<ResponseSchedulingDto>> originSchedulingMap) {
         List<DriverScheduling> bcList = new ArrayList<>(1000);
         for (String key : originSchedulingMap.keySet()) {
+
             List<ResponseSchedulingDto> schedulingList = originSchedulingMap.get(key);
             List<DriverScheduling> nowScheduling = schedulingList.stream()
                     .filter(item -> BC_TYPE_IN.equals(item.getBcType()) || BC_TYPE_OUT.equals(item.getBcType()))
@@ -484,16 +485,22 @@ public class ThreadJobService {
                     })
                     .sorted(Comparator.comparing(DriverScheduling::getFcsjT))
                     .collect(Collectors.toList());
-            if (nowScheduling.size() % 2 == 1 && nowScheduling.size() > 2) {
-                // 处理错误班次
-                nowScheduling = handleErrorBc(schedulingList);
-            }
-            // 处理松青线
-            // 松1路牌 签到时间 07:20 |松2路牌 签到时间 07:40 |松3路牌 签到时间 08:35 |松4路牌 签到时间 10:30
-            if (nowScheduling.get(0).getLineName().equals("松青线") && checkLpName(nowScheduling.get(0))) {
-                updateScheduling(nowScheduling);
+
+            if (CollectionUtil.isNotEmpty(nowScheduling)) {
+                if (nowScheduling.size() % 2 == 1 && nowScheduling.size() > 2) {
+                    // 处理错误班次
+                    nowScheduling = handleErrorBc(schedulingList);
+                }
+                // 处理松青线
+                // 松1路牌 签到时间 07:20 |松2路牌 签到时间 07:40 |松3路牌 签到时间 08:35 |松4路牌 签到时间 10:30
+                if (nowScheduling.get(0).getLineName().equals("松青线") && checkLpName(nowScheduling.get(0))) {
+                    updateScheduling(nowScheduling);
+                }
+                bcList.addAll(nowScheduling);
+            } else {
+                // 处理无进出场
+                log.info("无进出场驾驶员工号:{}", schedulingList.get(0).getJobCode());
             }
-            bcList.addAll(nowScheduling);
         }
         return bcList;
     }