feat: 特定设备无需测试酒精

guzijian
1 parent 03e5fac4
Showing 5 changed files with 41 additions and 5 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/DriverRequestVo.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/vo/UpdateAttendanceVo.java
@@ -79,7 +79,7 @@ public class DriverController extends BaseController {
      */
     @GetMapping("/getDrivers")
     @ApiOperation(value = "获取驾驶员信息列表(全量)", notes = "查询驾驶员信息列表")
-    public AjaxResult getDrivers(Driver driver) {
+    public AjaxResult getDrivers(DriverRequestVo driver) {
         return AjaxResult.success(driverService.getDrivers(driver));
     }
  
@@ -88,7 +88,7 @@ public interface IDriverService
  
     void downloadHeadImage(String jobCode, HttpServletResponse response);
  
-    List<DriverResponseVo> getDrivers(Driver driver);
+    List<DriverResponseVo> getDrivers(DriverRequestVo driver);
  
  
     AjaxResult faceRegistrationFeedback(String deviceId, List<String> jobCode);
@@ -321,13 +321,14 @@ public class DriverServiceImpl implements IDriverService {
     }
  
     @Override
-    public List<DriverResponseVo> getDrivers(Driver driver) {
+    public List<DriverResponseVo> getDrivers(DriverRequestVo driver) {
         List<Driver> drivers = driverMapper.getDrivers(driver);
         Long now = System.currentTimeMillis();
         List<DriverResponseVo> vos = new ArrayList<>(drivers.size());
         List<DriverScheduling> dto = null;
         Boolean schedulingFlag = true;
         Boolean alcoholFlag = true;
+        boolean needCheckAlcoholDevice = doCheckDevice(driver.getDeviceId());
         // 更新信息
         for (Driver item : drivers) {
             dto = schedulingService.queryScheduling(item.getJobCode(), now);
@@ -335,17 +336,19 @@ public class DriverServiceImpl implements IDriverService {
             // 针对指定用户操作
             if ( item.getJobCode().equals("722717") || item.getJobCode().equals("700001")) {
                 if (!CollectionUtil.isEmpty(dto) && vo.getPlanAction().equals(SIGN_IN_STRING) ){
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, true, true, "测试", "测试", "测试"));
+                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
                 }else if (!CollectionUtil.isEmpty(dto)){
                     vos.add(vo);
                 }else {
-                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, true, true, "测试", "测试", "测试"));
+                    vos.add(DriverResponseVo.createDriverResponseVo(null, item, SIGN_IN_STRING, needCheckAlcoholDevice, true, "测试", "测试", "测试"));
                 }
             }else {
                 // 无排班
                 if (Objects.isNull(vo)) {
                     vos.add(DriverResponseVo.createDriverResponseVo(null, item, null, false, false, "", "", ""));
                 } else {
+                    // 特定设备是无需酒精测试的
+                    vo.setCheckAlcohol(needCheckAlcoholDevice ? vo.getCheckAlcohol() : false);
                     vos.add(vo);
                 }
             }
@@ -353,6 +356,25 @@ public class DriverServiceImpl implements IDriverService {
         return vos;
     }
  
+    private boolean doCheckDevice(String deviceId) {
+        switch (deviceId){
+            case "001":
+            case "002":
+            case "003":
+            case "004":
+            case "005":
+            case "006":
+            case "007":
+            case "008":
+            case "009":
+            case "010":
+            case "011":
+            case "012":
+                return true;
+        }
+        return false;
+    }
+
     private DriverResponseVo handlerRecommendation(Driver driver, Long now, List<DriverScheduling> dto, Boolean schedulingFlag, Boolean alcoholFlag) {
         DriverResponseVo vo = null;
         // 给出计划操作
+package com.ruoyi.pojo.vo;
+
+import com.ruoyi.driver.domain.Driver;
+import lombok.Data;
+
+@Data
+public class DriverRequestVo extends Driver {
+    private String deviceId;
+}
@@ -2,6 +2,8 @@ package com.ruoyi.pojo.vo;
  
 import lombok.Data;
  
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
  
  
@@ -10,8 +12,11 @@ import java.util.List;
  */
 @Data
 public class UpdateAttendanceVo {
+    @NotEmpty(message = "工号不能为空")
     private List<String> jobCode;
+    @NotBlank(message = "开始日期不能为空")
     private String startDate;
+    @NotBlank(message = "结束日期不能为空")
     private String endDate;
     private Integer ruleId;
 }