蓝斯接口模糊查询车辆车牌列表\司机获取当前工作的车辆钥匙信息

liujun001
1 parent 5ce3372c
Showing 22 changed files with 577 additions and 26 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBeforeWorkListDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBusPlanListDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/vo/GetBeforeWorkListVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/vo/GetBusPlanListVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationUpdateStatusDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/vo/LinggangKeyWorkLocationVO.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/IEquipmentService.java
Bsth-admin/src/main/java/com/ruoyi/equipment/service/impl/EquipmentServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/driver/NewDriverService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
 package com.ruoyi.controller.dss;
 import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.driver.dss.syn.DrivePosEnum;
 import com.ruoyi.domain.driver.dss.syn.login.dto.LoginDriverDTO;
 import com.ruoyi.domain.driver.dss.syn.login.vo.LoginDriverVo;
 import com.ruoyi.domain.driver.dss.syn.login.vo.LoginUserInfoVo;
+import com.ruoyi.domain.dss.driver.dto.GetBeforeWorkListDTO;
+import com.ruoyi.domain.dss.driver.dto.GetBusPlanListDTO;
+import com.ruoyi.domain.dss.driver.vo.GetBeforeWorkListVo;
+import com.ruoyi.domain.dss.driver.vo.GetBusPlanListVo;
 import com.ruoyi.domain.dss.sign.dto.DssGetWineRecordDTO;
 import com.ruoyi.domain.dss.sign.dto.DssSignDTO;
 import com.ruoyi.domain.dss.sign.dto.DssSignOutDTO;
 import com.ruoyi.domain.dss.sign.vo.DssSignVo;
 import com.ruoyi.domain.dss.sign.vo.GetWineRecordVo;
 import com.ruoyi.domain.dss.sign.vo.SignOutVo;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.response.SignInResponseVo;
+import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.FaceService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 /**
  * @author liujun
@@ -43,7 +57,7 @@ import java.util.Set;
  */
 @RestController
 @Slf4j
-@RequestMapping("/dss/Driver")
+@RequestMapping("/dss")
 @Api(tags = "【蓝斯一期】人员信息")
 public class DssDriverController extends BaseController {
     @Autowired
@@ -54,8 +68,14 @@ public class DssDriverController extends BaseController {
     private ISignInService signInService;
     @Autowired
     private FaceService faceService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
+    @Autowired
+    private CarInfoService carInfoService;
+    @Autowired
+    private IEquipmentService equipmentService;
-    @PostMapping(value = "Login")
+    @PostMapping(value = "/Driver/Login")
     @ApiOperation("人员登录设备")
     public ResponseResult<LoginDriverVo> login(@Valid @RequestBody LoginDriverDTO loginDriverDTO, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -70,7 +90,7 @@ public class DssDriverController extends BaseController {
         return ResponseResult.success(convertNewDriver(driver));
     }
-    @PostMapping(value = "SignIn")
+    @PostMapping(value = "/Driver/SignIn")
     @ApiOperation("人员签到")
     public ResponseResult<DssSignVo> sign(@Valid @RequestBody DssSignDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -94,7 +114,7 @@ public class DssDriverController extends BaseController {
     }
-    @PostMapping(value = "SignOut")
+    @PostMapping(value = "/Driver/SignOut")
     @ApiOperation("人员签退")
     public ResponseResult<SignOutVo> signOut(@Valid @RequestBody DssSignOutDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -115,7 +135,7 @@ public class DssDriverController extends BaseController {
         }
     }
-    @GetMapping(value = "GetWineRecord")
+    @GetMapping(value = "/Driver/GetWineRecord")
     @ApiOperation("校验司机酒测记录是否有效")
     public ResponseResult<GetWineRecordVo> getWineRecord(@Valid @RequestBody DssGetWineRecordDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
@@ -127,9 +147,68 @@ public class DssDriverController extends BaseController {
         return ResponseResult.success(convertGetWineRecordVo(dataSignIn));
     }
+    @PostMapping(value = "/Info/GetBusPlanList")
+    @ApiOperation(value = "22.查询司机排班计划信息")
+    public ResponseResult<Map<String, Object>> GetBusPlanList(@Valid @RequestBody GetBusPlanListDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangScheduling scheduling = convertScheduling(dto);
+        IPage<LinggangScheduling> iPage = schedulingService.pageList(new Page<LinggangScheduling>(dto.getPageNumber(), dto.getPageRow()), scheduling, new OrderEntity());
+        if (Objects.isNull(iPage)) {
+            return ResponseResult.error();
+        }
+        if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
+            Set<String> nbbm = iPage.getRecords().stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
+            List<CarInfo> carInfos = carInfoService.list(nbbm);
+            Map<String, Object> getBusPlanListVo = convertGetBusPlanListVo(iPage, dto, carInfos);
+            return ResponseResult.success(getBusPlanListVo);
+        }
+        return ResponseResult.success();
+    }
+
+
+    @PostMapping(value = "/workResult/GetBeforeWorkList")
+    @ApiOperation(value = "23.获取酒测记录列表")
+    public ResponseResult<List<GetBeforeWorkListVo>> getBeforeWorkList(@Valid @RequestBody GetBeforeWorkListDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        NewDriver newDriver = convertGetBeforeWorkListDTO(dto);
+        SignIn signIn = convertSignIn(dto);
+
+        Set<String> jobCodes = null;
+        List<NewDriver> drivers = null;
+        if (Objects.nonNull(newDriver)) {
+            drivers = newDriverService.listOficRfidAndLikePersonnelNameJobCodeIcCardCode(newDriver);
+            if (CollectionUtils.isNotEmpty(drivers)) {
+                jobCodes = drivers.stream().map(NewDriver::getJobCode).collect(Collectors.toSet());
+            }
+        }
+        List<SignIn> signIns = signInService.selectByEntityOrNewDriverId(signIn, jobCodes);
+        if (CollectionUtils.isEmpty(signIns)) {
+            return ResponseResult.success();
+        }
+
+        if (CollectionUtils.isEmpty(jobCodes)) {
+            jobCodes = signIns.stream().map(SignIn::getJobCode).collect(Collectors.toSet());
+            drivers = newDriverService.list(jobCodes);
+        }
+
+        Set<Long> schedulingIds = signIns.stream().map(SignIn::getSchedulingId).collect(Collectors.toSet());
+        List<LinggangScheduling> schedulings = schedulingService.listByIds(schedulingIds);
+
+        Set<String> deviceIds = signIns.stream().map(SignIn::getDeviceId).collect(Collectors.toSet());
+        List<Equipment> equipmentList = equipmentService.listNameAndIDBydeviceIds(deviceIds);
+
+        List<GetBeforeWorkListVo> vos = convertGetBeforeWorkListVos(signIns, drivers, schedulings, equipmentList);
+
+        return ResponseResult.success(vos);
+    }
     /***
@@ -202,6 +281,64 @@ public class DssDriverController extends BaseController {
         return driver;
     }
+    private NewDriver convertGetBeforeWorkListDTO(GetBeforeWorkListDTO dto) {
+        Boolean flag = Boolean.TRUE;
+        NewDriver newDriver = new NewDriver();
+        if (StringUtils.isNotEmpty(dto.getIcCardNo())) {
+            newDriver.setIcRfid(dto.getIcCardNo());
+            flag = Boolean.FALSE;
+        }
+        if (StringUtils.isNotEmpty(dto.getDriver())) {
+            newDriver.setPersonnelName(dto.getDriver());
+            newDriver.setJobCode(dto.getDriver());
+            newDriver.setIcCardCode(dto.getDriver());
+            flag = Boolean.FALSE;
+        }
+
+        return flag ? null : newDriver;
+    }
+
+    private SignIn convertSignIn(GetBeforeWorkListDTO dto) {
+        SignIn signIn = new SignIn();
+        Boolean flag = Boolean.TRUE;
+        if (Objects.nonNull(dto.getCheckTime())) {
+            signIn.setCreateTime(dto.getCheckTime());
+            flag = false;
+        }
+
+        if (Objects.nonNull(dto.getDrunkStatus())) {
+            switch (dto.getDrunkStatus()) {
+                case 0:
+                    signIn.setExType(0);
+                    flag = false;
+                    break;
+                case 11:
+                    signIn.setExType(44);
+                    flag = false;
+                    break;
+
+                case 12:
+                    signIn.setExType(3);
+                    flag = false;
+                    break;
+            }
+        }
+
+        if (Objects.nonNull(dto.getCheckResult())) {
+            switch (dto.getCheckResult()) {
+                case 0:
+                    signIn.setStatus(1);
+                    flag = false;
+                    break;
+                case 1:
+                    signIn.setStatus(2);
+                    flag = false;
+                    break;
+            }
+        }
+        return flag ? null : signIn;
+    }
+
     private SignIn convertSignIn(DssSignDTO dto) {
         SignIn signIn = new SignIn();
         signIn.setDeviceId(dto.getDevice());
@@ -269,5 +406,83 @@ public class DssDriverController extends BaseController {
         return vo;
     }
+    private LinggangScheduling convertScheduling(GetBusPlanListDTO dto) {
+        LinggangScheduling scheduling = new LinggangScheduling();
+        if (Objects.equals(0, dto.getDateType())) {
+            scheduling.setScheduleDate(new Date());
+        } else if (Objects.equals(1, dto.getDateType())) {
+            scheduling.setScheduleDate(DateUtils.addDays(new Date(), 1));
+        }
+
+        return scheduling;
+    }
+
+    private Map<String, Object> convertGetBusPlanListVo(IPage<LinggangScheduling> iPage, GetBusPlanListDTO dto, List<CarInfo> carInfos) {
+        if (Objects.isNull(iPage)) {
+            return null;
+        }
+        Map<String, Object> result = new HashMap<>();
+        result.put("total", iPage.getTotal());
+        result.put("size", dto.getPageRow());
+        result.put("current", dto.getPageNumber());
+
+        if (CollectionUtils.isNotEmpty(iPage.getRecords())) {
+            List<GetBusPlanListVo> vos = iPage.getRecords().stream().map(scheduling -> {
+                GetBusPlanListVo vo = new GetBusPlanListVo();
+                vo.setDriverName(scheduling.getName());
+                vo.setSelfCode(scheduling.getNbbm());
+                if (CollectionUtils.isNotEmpty(carInfos)) {
+                    Optional<CarInfo> optional = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), scheduling.getNbbm())).findFirst();
+                    if (optional.isPresent()) {
+                        vo.setCarNo(optional.get().getPlateNum());
+                    }
+                }
+                vo.setRouteName(scheduling.getLineName());
+                vo.setFache(new Date(scheduling.getFcsjT()));
+
+                return vo;
+            }).collect(Collectors.toList());
+            result.put("records", vos);
+        }
+        return result;
+    }
+
+    private List<GetBeforeWorkListVo> convertGetBeforeWorkListVos(List<SignIn> signIns, List<NewDriver> drivers, List<LinggangScheduling> schedulings,
+                                                                  List<Equipment> equipmentList) {
+        if (CollectionUtils.isEmpty(signIns)) {
+            return Collections.emptyList();
+        }
+        return signIns.stream().map(s -> {
+            GetBeforeWorkListVo vo = new GetBeforeWorkListVo();
+            vo.setCheckTime(s.getCreateTime());
+            if (CollectionUtils.isNotEmpty(schedulings)) {
+                Optional<LinggangScheduling> optional = schedulings.stream().filter(sc -> Objects.equals(sc.getId(), s.getSchedulingId())).findFirst();
+                if (optional.isPresent()) {
+                    vo.setRouteName(optional.get().getLineName());
+                }
+            }
+
+            if (CollectionUtils.isNotEmpty(drivers)) {
+                Optional<NewDriver> optional = drivers.stream().filter(d -> Objects.equals(d.getJobCode(), s.getJobCode())).findFirst();
+                if (optional.isPresent()) {
+                    vo.setStaffId(Convert.toStr(optional.get().getId()));
+                    vo.setStaffName(optional.get().getPersonnelName());
+                    vo.setIcCardNo(optional.get().getIcCardCode());
+                }
+            }
+
+            if (CollectionUtils.isNotEmpty(equipmentList)) {
+                Optional<Equipment> optional = equipmentList.stream().filter(e -> Objects.equals(e.getDeviceId(), s.getDeviceId())).findFirst();
+                if (optional.isPresent()) {
+                    vo.setDeviceName(optional.get().getSiteName());
+                }
+            }
+            vo.setCheckResult(Convert.toStr(s.getStatus()));
+            vo.setDrunkNum(Convert.toStr(s.getAlcoholIntake()));
+
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
 }
@@ -201,7 +201,23 @@ public class KeyBoxController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         List<LinggangKeyWorkLocation> locations = convert(dto);
-        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations);
+        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.TAKE_OUT);
+        if (Objects.isNull(responseResult)) {
+            return ResponseResult.error();
+        }
+        TakeKeyVo vo = convertTakeKeyVo(dto, responseResult);
+
+        return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
+    }
+
+    @PostMapping(value = "Driver/TurnKey")
+    @ApiModelProperty(value = "21.人员归还钥匙")
+    public ResponseResult<TakeKeyVo> turnKey(@Valid TakeKeyDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<LinggangKeyWorkLocation> locations = convert(dto);
+        ResponseResult<Boolean> responseResult = linggangKeyWorkLocationService.updateTakeKey(locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum.REPAY);
         if (Objects.isNull(responseResult)) {
             return ResponseResult.error();
         }
+package com.ruoyi.domain.dss.driver.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月24日 16:32
+ */
+@Data
+@ApiModel(value = "获取酒测记录列表")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GetBeforeWorkListDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -19813580197166104L;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "酒测时间")
+    private Date checkTime;
+
+    @ApiModelProperty(value = "IC卡号")
+    private String icCardNo;
+
+    @ApiModelProperty(value = "酒测状态 0正常，11饮酒，12醉酒")
+    private Integer drunkStatus;
+
+    @ApiModelProperty(value = "体温状态 0正常，1异常")
+    private Integer tempStatus;
+
+    @ApiModelProperty(value = "模糊查询  姓名/卡号/工号")
+    private String driver;
+    @ApiModelProperty(value = "岗前检测结果 0通过，1不通过")
+    private Integer checkResult;
+}
+package com.ruoyi.domain.dss.driver.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author liujun
+ * @date 2024年07月22日 13:42
+ */
+@Data
+@ApiModel(value = "查询司机排班计划信息")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GetBusPlanListDTO implements java.io.Serializable{
+
+    private static final long serialVersionUID = 7253500856181067506L;
+
+    @NotEmpty(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号",required = true)
+   private String device;
+
+    @NotEmpty(message = "卡号不能为空")
+    @ApiModelProperty(value = "卡号",required = true)
+    private Integer  driverCode;
+
+    @NotEmpty(message = "数据类型为空")
+    @ApiModelProperty(value = "数据类型;0今天，1明天，2/null全部",required = true,example = "1")
+    private Integer  dateType;
+
+    @NotEmpty(message = "第几页为空")
+    @ApiModelProperty(value = "第几页",required = true,example = "1")
+    private Integer    pageNumber;
+
+    @NotEmpty(message = "每页条数为空")
+    @ApiModelProperty(value = "每页条数",required = true,example = "1")
+    private Integer    pageRow;
+}
+package com.ruoyi.domain.dss.driver.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月24日 16:37
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "获取酒测记录列表")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GetBeforeWorkListVo {
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "酒测时间")
+    private Date checkTime;
+    @ApiModelProperty(value = "场站名称")
+    private String yarnName;
+    @ApiModelProperty(value = "线路名称")
+    private String routeName;
+    @ApiModelProperty(value = "员工ID")
+    private String staffId;
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    @ApiModelProperty(value = "IC卡号")
+    private String icCardNo;
+    @ApiModelProperty(value = "测试结果 0通过，1不通过")
+    private String checkResult;
+
+    @ApiModelProperty(value = "体温")
+    private String temperature;
+    @ApiModelProperty(value = "体温状态 0正常，1异常")
+    private String tempStatus;
+    @ApiModelProperty(value = "酒精含量")
+    private String drunkNum;
+    @ApiModelProperty(value = "酒测状态 0正常，11饮酒，12醉酒")
+    private String drunkStatus;
+    @ApiModelProperty(value = "表情 0无情绪，1愤怒，2厌恶，3恐惧，4高兴，5伤心，6惊讶")
+    private String emotion;
+    @ApiModelProperty(value = "收缩压")
+    private String diastolicPressure;
+    @ApiModelProperty(value = "舒张压")
+    private String systolicPressure;
+    @ApiModelProperty(value = "心率值")
+    private String heartRate;
+    @ApiModelProperty(value = "血氧值")
+    private String oxygenValue;
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+}
+package com.ruoyi.domain.dss.driver.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月22日 13:47
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "司机排班计划信息")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GetBusPlanListVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = 6822862763627861841L;
+
+
+    @ApiModelProperty(value = "驾驶员名称")
+    private String driverName;
+    @ApiModelProperty(value = "车自编号")
+    private String selfCode;
+    @ApiModelProperty(value = "车牌号")
+    private String carNo;
+    @ApiModelProperty(value = "班次类型: 早班/晚班/全天班")
+    private String planType;
+
+    @ApiModelProperty(value = "线路名")
+    private String routeName;
+    @ApiModelProperty(value = "行车方向 1上行，2下行")
+    private String upDown;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "发车时间;格式为：yyyy-MM-dd HH:mm:ss")
+    private Date fache;
+    @ApiModelProperty(value = "起点站名")
+    private String startStation;
+}
@@ -99,9 +99,12 @@ public class LinggangKeyWorkLocation {
      */
     @TableField(exist = false)
     private String key;
+    /***状态：1 是归还；0是借出*/
+    @Excel(name = "状态：1 是归还；0是借出")
+    private java.lang.Integer type;
-    public static enum LinggangKeyWorkLocationEventTypeEnum {
+    public enum LinggangKeyWorkLocationEventTypeEnum {
         TAKE_OUT(0, "取出"),
         REPAY(1, "归还"),
         ADMINISTRATOR_OPERATION(16, "管理员操作"),
@@ -140,6 +143,45 @@ public class LinggangKeyWorkLocation {
     }
+    public enum LinggangKeyWorkLocationTypeEnum {
+
+        TAKE_OUT(0, "取出"),
+
+        REPAY(1, "归还"),
+        
+        ;
+
+        private String label;
+        private Integer value;
+
+        LinggangKeyWorkLocationTypeEnum(Integer value, String label) {
+            this.value = value;
+            this.label = label;
+        }
+
+        public String getLabel() {
+            return label;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public static LinggangKeyWorkLocationTypeEnum getObj(Integer value) {
+            if (Objects.isNull(value)) {
+                return null;
+            }
+            Optional<LinggangKeyWorkLocationTypeEnum> optional = Arrays.stream(LinggangKeyWorkLocationTypeEnum.values())
+                    .filter(l -> Objects.equals(l.getValue(), value)).findFirst();
+            return optional.isPresent() ? optional.get() : null;
+        }
+
+        public static String getLabel(Integer value) {
+            LinggangKeyWorkLocationTypeEnum eventTypeEnum = getObj(value);
+            return Objects.isNull(eventTypeEnum) ? null : eventTypeEnum.getLabel();
+        }
+    }
+
     @Override
     public String toString() {
         return com.alibaba.fastjson2.JSON.toJSONString(this);
 package com.ruoyi.domain.key.location.dto;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -59,6 +60,10 @@ public class LinggangKeyWorkLocationAddDTO implements java.io.Serializable {
     @ApiModelProperty(value="排班ID")
     private Long schedulingId;
+    /***状态：1 是归还；0是借出*/
+    @Excel(name = "状态：1 是归还；0是借出")
+    private java.lang.Integer type;
+
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
 package com.ruoyi.domain.key.location.dto;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -55,6 +56,10 @@ public class LinggangKeyWorkLocationQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value="排班ID")
     private Long schedulingId;
+    /***状态：1 是归还；0是借出*/
+    @Excel(name = "状态：1 是归还；0是借出")
+    private java.lang.Integer type;
+
     /***排班时间*/
     @ApiModelProperty(value="排班时间")
     private java.util.Date scheduleDate;
 package com.ruoyi.domain.key.location.dto;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,6 +59,10 @@ public class LinggangKeyWorkLocationUpdateDTO implements java.io.Serializable {
     /***排班ID*/
     @ApiModelProperty(value="排班ID")
     private Long schedulingId;
+
+    /***状态：1 是归还；0是借出*/
+    @Excel(name = "状态：1 是归还；0是借出")
+    private java.lang.Integer type;
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
 package com.ruoyi.domain.key.location.dto;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -58,6 +59,10 @@ public class LinggangKeyWorkLocationUpdateStatusDTO implements java.io.Serializa
     /***排班ID*/
     @ApiModelProperty(value = "排班ID")
     private Long schedulingId;
+
+    /***状态：1 是归还；0是借出*/
+    @Excel(name = "状态：1 是归还；0是借出")
+    private java.lang.Integer type;
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
 package com.ruoyi.domain.key.location.vo;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
+import lombok.experimental.Accessors;
 @Data
 @NoArgsConstructor
@@ -60,6 +60,10 @@ public class LinggangKeyWorkLocationVO implements java.io.Serializable {
     @ApiModelProperty(value = "排班时间")
     private java.util.Date scheduleDate;
+    /***状态：1 是归还；0是借出*/
+    @Excel(name = "状态：1 是归还；0是借出")
+    private java.lang.Integer type;
+
     /***排班ID*/
     @ApiModelProperty(value = "排班ID")
     private Long schedulingId;
@@ -59,6 +59,8 @@ public interface IEquipmentService extends IService&lt;Equipment&gt; {
      */
     List<Equipment> listNameAndIDByIds(Collection<Integer> ids);
+    List<Equipment> listNameAndIDBydeviceIds(Collection<String> deviceIds);
+
     /**
      * 查询设备信息列表
      *
@@ -82,6 +82,17 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
         return list(wrapper);
     }
+    @Override
+    public List<Equipment> listNameAndIDBydeviceIds(Collection<String> deviceIds) {
+        if (CollectionUtils.isEmpty(deviceIds)) {
+            return Collections.emptyList();
+        }
+
+        LambdaQueryWrapper<Equipment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(Equipment::getDeviceId, deviceIds);
+        return list(wrapper);
+    }
+
     /**
      * 查询设备信息列表
      *
 package com.ruoyi.in.domain;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 /**
  * 签到对象 sign_in
@@ -95,8 +91,13 @@ public class SignIn extends BaseEntity {
     @Excel(name = "酒精摄入量")
     @ApiModelProperty("酒精摄入量 52.12")
     private BigDecimal alcoholIntake;
-    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常")
+    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
+
     @ApiModelProperty("异常类型")
     private Integer exType;
+
+    /***排班信息ID*/
+    @Excel(name = "排班信息ID")
+    private java.lang.Long schedulingId;
 }
@@ -9,6 +9,7 @@ import com.ruoyi.pojo.response.SignInResponseVo;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 /**
@@ -26,6 +27,8 @@ public interface ISignInService extends IService&lt;SignIn&gt; {
      */
     public SignIn selectSignInById(Long id);
+    List<SignIn> selectByEntityOrNewDriverId(SignIn signIn, Collection<String> jobCodes);
+
     /**
      * 查询签到列表
      *
@@ -111,6 +111,15 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         return signInMapper.selectSignInById(id);
     }
+    @Override
+    public List<SignIn> selectByEntityOrNewDriverId(SignIn signIn, Collection<String> jobCodes) {
+        LambdaQueryWrapper<SignIn> wrapper = Objects.isNull(signIn) ? new LambdaQueryWrapper<>() : new LambdaQueryWrapper<>(signIn);
+        if (CollectionUtils.isNotEmpty(jobCodes)) {
+            wrapper.in(SignIn::getJobCode, jobCodes);
+        }
+        return list(wrapper);
+    }
+
     /**
      * 查询签到列表
      *
@@ -21,6 +21,8 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
      */
     List<NewDriver> list(NewDriver entity);
+    List<NewDriver> listOficRfidAndLikePersonnelNameJobCodeIcCardCode(NewDriver newDriver);
+
     /***
      * 根据工号查询司机
      * @author liujun
@@ -64,6 +64,29 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     }
     @Override
+    public List<NewDriver> listOficRfidAndLikePersonnelNameJobCodeIcCardCode(NewDriver newDriver) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(newDriver.getIcRfid())) {
+            wrapper.eq(NewDriver::getIcRfid, newDriver.getIcRfid());
+        }
+
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(newDriver.getPersonnelName())) {
+            wrapper.like(NewDriver::getPersonnelName, newDriver.getPersonnelName());
+        }
+
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(newDriver.getJobCode())) {
+            wrapper.like(NewDriver::getJobCode, newDriver.getJobCode());
+        }
+
+        if (org.apache.commons.lang3.StringUtils.isNotEmpty(newDriver.getIcCardCode())) {
+            wrapper.like(NewDriver::getIcCardCode, newDriver.getIcCardCode());
+        }
+
+        return list(wrapper);
+    }
+
+    @Override
     public List<NewDriver> list(Collection<String> jobCodes) {
         if (CollectionUtils.isEmpty(jobCodes)) {
             return Collections.emptyList();
@@ -134,12 +134,12 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     }
     @Override
-    public ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations) {
+    public ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum) {
         if (CollectionUtils.isEmpty(locations)) {
             return ResponseResult.success();
         }
-        ResponseResult<List<LinggangKeyWorkLocation>> responseResult = checkTaskKey(locations);
+        ResponseResult<List<LinggangKeyWorkLocation>> responseResult = checkTaskKey(locations,typeEnum);
         if (!responseResult.isSuccess()) {
             return ResponseResult.error(responseResult.getCode(), responseResult.getMsg());
         }
@@ -259,7 +259,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }
     }
-    private ResponseResult<List<LinggangKeyWorkLocation>> checkTaskKey(List<LinggangKeyWorkLocation> locations) {
+    private ResponseResult<List<LinggangKeyWorkLocation>> checkTaskKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum) {
         Set<String> keyCodes = locations.stream().map(LinggangKeyWorkLocation::getKey).collect(Collectors.toSet());
         List<KeyInfo> keyInfos = keyInfoService.list(keyCodes);
         if (CollectionUtils.isEmpty(keyInfos)) {
@@ -297,6 +297,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             location.setDevice(l.getDevice());
             location.setKeyInfoId(l.getKeyInfoId());
             location.setScheduleDate(l.getScheduleDate());
+            location.setType(typeEnum.getValue());
             return location;
         }).collect(Collectors.toList());
@@ -56,7 +56,7 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
      * @param locations
      * @return com.ruoyi.common.core.domain.ResponseResult<T>
      */
-     ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations);
+     ResponseResult<Boolean> updateTakeKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum);
     boolean deleteById(Long id);
@@ -20,6 +20,7 @@
         <result property="remark" column="remark"/>
         <result property="posts" column="posts"/>
         <result property="name" column="personnel_name"/>
+        <result column="scheduling_id" jdbcType="INTEGER" property="schedulingId" />
     </resultMap>
     <resultMap type="SignIn" id="SignInResult">
         <result property="id" column="id"/>
@@ -36,6 +37,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="alcoholIntake" column="alcohol_intake"/>
         <result property="remark" column="remark"/>
+        <result column="scheduling_id" jdbcType="INTEGER" property="schedulingId" />
     </resultMap>
     <sql id="selectSignInVo">
@@ -52,7 +54,8 @@
                type,
                update_time,
                alcohol_intake,
-               remark
+               remark,
+               scheduling_id
         from sign_in
     </sql>
@@ -71,6 +74,7 @@
         <if test="alcoholIntake != null ">and alcohol_intake = #{alcoholIntake}</if>
         <if test="siteName != null ">and site_name = #{siteName}</if>
         <if test="date != null ">and sign_in.create_time LIKE concat(#{date},'%')</if>
+        <if test="null!=schedulingId"> scheduling_id = #{schedulingId}</if>
         order by create_time desc
     </select>
@@ -93,6 +97,7 @@
         <if test="name != '' and name != null">
             and driver.personnel_name = #{name}
         </if>
+        <if test="null!=schedulingId"> scheduling_id = #{schedulingId}</if>
         <if test="ids != null and ids.size() > 0">
             and sign_in.id in
             <foreach collection="ids" item="id" open="(" close=")" separator=",">
@@ -108,6 +113,7 @@
             and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime}
             and DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
         </if>
+        <if test="null!=schedulingId"> scheduling_id = #{schedulingId}</if>
         <if test="jobCode != '' and jobCode != null">
             and jobCode = #{jobCode}
         </if>
@@ -164,6 +170,7 @@
             <if test="alcoholIntake != null">alcohol_intake,</if>
             <if test="remark != null">remark,</if>
             <if test="exType != null">ex_type,</if>
+            <if test="null!=schedulingId">scheduling_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="createTime != null">#{createTime},</if>
@@ -180,6 +187,7 @@
             <if test="alcoholIntake != null">#{alcoholIntake},</if>
             <if test="remark != null">#{remark},</if>
             <if test="exType != null">#{exType},</if>
+            <if test="null!=schedulingId">#{schedulingId,jdbcType=INTEGER},</if>
         </trim>
     </insert>
@@ -200,6 +208,7 @@
             <if test="alcoholIntake != null">alcohol_intake = #{alcoholIntake},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="exType != null">ex_type = #{exType},</if>
+            <if test="null!=schedulingId"> scheduling_id = #{schedulingId},</if>
         </trim>
         where id = #{id}
     </update>