feat: 更新目录结构，可弹窗人员

guzijian
1 parent f0065f8d
Showing 4 changed files with 37 additions and 4 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/BigViewController.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/service/EmailService.java
+package com.ruoyi.controller;
+
+import com.ruoyi.common.global.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 可视化大屏控制controller
+ * @author 20412
+ */
+@RestController
+@RequestMapping("/big/view")
+@Api(tags = "可视化大屏")
+public class BigViewController {
+
+
+    @ApiOperation("获取但当天打卡记录")
+    @GetMapping("/getTodayRecord")
+    public Result<?> getTodayRecord(){
+        return Result.OK();
+    }
+
+}
@@ -587,10 +587,16 @@ public class DriverServiceImpl implements IDriverService {
         switch (item.getPosts()){
             case "驾驶员":
             case "售票员":
-            case "科员":
+            case "采集员":
+            case "调度":
+            case "稽查":
+            case "集调中心":
+            case "票务":
+            case "站员":
                 return true;
+            default:
+                return false;
         }
-        return false;
     }
     /**
@@ -80,7 +80,7 @@ public class SignInController extends BaseController {
     /**
      * 补签
      */
-//    @PreAuthorize("@ss.hasPermi('in:in:add')")
+//    @PreAuthorize("@ss.hasPermi('in:in:signature')")
     @Log(title = "补签", businessType = BusinessType.INSERT)
     @PutMapping("/supplementarySignature")
     @ApiOperation("补签（通过后台管理页面）")
 package com.ruoyi.service;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.email.domain.EmailConfig;
 import com.ruoyi.email.service.IEmailConfigService;
 import com.ruoyi.domain.DriverScheduling;
@@ -76,7 +77,7 @@ public class EmailService {
     }
     private List<String> getRecipientsEmailIds(EmailConfig config) {
-        if (!Objects.isNull(config.getParentId())){
+        if (StringUtils.isNotEmpty(config.getParentId())){
             return emailConfigService
                     .selectEmailConfigListByIds(Arrays.stream(config.getParentId()
                     .split(","))