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

liujun001
1 parent 13d622c9
Showing 59 changed files with 2551 additions and 231 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssCarInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/keyinfo/KeyInfoController.java → Bsth-admin/src/main/java/com/ruoyi/controller/key/info/KeyInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/key/location/LinggangKeyWorkLocationController.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/CarInfo.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/CarInfoAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/CarInfoQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/CarInfoUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/vo/CarInfoVO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/car/info/dto/GetPlatesDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/location/dto/WorkPlateV2DTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/location/vo/WorkPlateV2Vo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssGetWineRecordDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/vo/GetWineRecordVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/keyInfo/KeyInfo.java → Bsth-admin/src/main/java/com/ruoyi/domain/key/info/KeyInfo.java
Bsth-admin/src/main/java/com/ruoyi/domain/keyInfo/box/dto/KeyBoxQueryDTO.java → Bsth-admin/src/main/java/com/ruoyi/domain/key/info/box/dto/KeyBoxQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/keyInfo/box/vo/KeyBoxVo.java → Bsth-admin/src/main/java/com/ruoyi/domain/key/info/box/vo/KeyBoxVo.java
+package com.ruoyi.controller.dss;
+
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.domain.caiinfo.CarInfo;
+import com.ruoyi.domain.dss.car.info.dto.GetPlatesDTO;
+import com.ruoyi.service.carinfo.CarInfoService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 15:13
+ */
+@RestController
+@RequestMapping("/dss")
+@Api(tags = "【蓝斯一期】岗前设备报警信息")
+public class DssCarInfoController {
+    @Autowired
+    private CarInfoService carInfoService;
+
+    @GetMapping(value = "/device/getPlates")
+    @ApiModelProperty("模糊查询车辆车牌列表")
+    public ResponseResult<Set<String>> getPlates(@Valid @RequestBody GetPlatesDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        CarInfo carInfo = convertCarInfo(dto);
+        if (StringUtils.isEmpty(carInfo.getPlateNum())) {
+            return ResponseResult.success();
+        }
+
+        List<CarInfo> carInfos = carInfoService.likePlateNumPlateNumTop30(carInfo);
+        if (CollectionUtils.isEmpty(carInfos)) {
+            return ResponseResult.success();
+        }
+        Set<String> plateNums = carInfos.stream().map(CarInfo::getPlateNum).collect(Collectors.toSet());
+        return ResponseResult.success(plateNums);
+    }
+
+    private CarInfo convertCarInfo(GetPlatesDTO dto) {
+        CarInfo carInfo = new CarInfo();
+        carInfo.setPlateNum(dto.getPlate());
+
+        return carInfo;
+    }
+}
@@ -11,9 +11,11 @@ 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.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.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
@@ -27,9 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -57,7 +57,7 @@ public class DssDriverController extends BaseController {
     @PostMapping(value = "Login")
     @ApiOperation("人员登录设备")
-    public ResponseResult<LoginDriverVo> login(@Valid LoginDriverDTO loginDriverDTO, BindingResult bindingResult) {
+    public ResponseResult<LoginDriverVo> login(@Valid @RequestBody LoginDriverDTO loginDriverDTO, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -72,7 +72,7 @@ public class DssDriverController extends BaseController {
     @PostMapping(value = "SignIn")
     @ApiOperation("人员签到")
-    public ResponseResult<DssSignVo> sign(@Valid DssSignDTO dto, BindingResult bindingResult) {
+    public ResponseResult<DssSignVo> sign(@Valid @RequestBody DssSignDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -95,7 +95,8 @@ public class DssDriverController extends BaseController {
     @PostMapping(value = "SignOut")
-    public ResponseResult<SignOutVo> signOut(@Valid DssSignOutDTO dto, BindingResult bindingResult) {
+    @ApiOperation("人员签退")
+    public ResponseResult<SignOutVo> signOut(@Valid @RequestBody DssSignOutDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -114,6 +115,22 @@ public class DssDriverController extends BaseController {
         }
     }
+    @GetMapping(value = "GetWineRecord")
+    @ApiOperation("校验司机酒测记录是否有效")
+    public ResponseResult<GetWineRecordVo> getWineRecord(@Valid @RequestBody DssGetWineRecordDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        SignIn signIn = convertSignIn(dto);
+        SignIn dataSignIn = signInService.getLastOne(signIn);
+        return ResponseResult.success(convertGetWineRecordVo(dataSignIn));
+    }
+
+
+
+
+
     /***
      * 登陆转换
@@ -219,6 +236,14 @@ public class DssDriverController extends BaseController {
         return signIn;
     }
+    private SignIn convertSignIn(DssGetWineRecordDTO dto) {
+        SignIn signIn = new SignIn();
+        signIn.setJobCode(dto.getStaffCode());
+        signIn.setDeviceId(dto.getDevice());
+
+        return signIn;
+    }
+
     private DssSignVo convertSignInVo(SignInResponseVo responseVo) {
         DssSignVo vo = new DssSignVo();
         vo.setTestId(Convert.toStr(responseVo.getId()));
@@ -236,5 +261,13 @@ public class DssDriverController extends BaseController {
         return new SignOutVo(dto.getDevice(), dto.getDriverCode(), dto.getLogoutTime());
     }
+    private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
+        GetWineRecordVo vo = new GetWineRecordVo();
+        vo.setCheckTime(signIn.getCreateTime());
+        vo.setCheck(Objects.equals(signIn.getType(), 0));
+
+        return vo;
+    }
+
 }
@@ -79,7 +79,7 @@ public class DssEquipmentController extends BaseController {
     @ApiOperation("设备获取访问令牌")
     @GetMapping("/Auth")
-    public ResponseResult auth(@Valid EquipmentAuthDTO dto, BindingResult bindingResult) {
+    public ResponseResult auth(@Valid @RequestBody EquipmentAuthDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -141,7 +141,7 @@ public class DssEquipmentController extends BaseController {
     @PostMapping("/selfcheck")
     @ApiOperation("设备获取远程参数配置")
-    public ResponseResult selfCheck(@Valid EquipmentSelfcheckDto equipmentSelfcheckDto, BindingResult bindingResult) {
+    public ResponseResult selfCheck(@Valid @RequestBody EquipmentSelfcheckDto equipmentSelfcheckDto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -21,6 +21,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -46,14 +47,15 @@ public class DssFaceController extends BaseController {
     @PostMapping("/syn/reqData")
     @ApiOperation("获取数据库人员信息")
-    public List<DssDriveVo> queryDriver(@Valid DssDriveQueryDTO dto, BindingResult bindingResult) {
+    public List<DssDriveVo> queryDriver(@Valid @RequestBody DssDriveQueryDTO dto, BindingResult bindingResult) {
+
         List<NewDriver> drivers = newDriverService.list();
         return convertDssDriveVo(drivers);
     }
     @ApiOperation("终端同步人脸数据结果上报")
     @PostMapping(value = "/syn/resData")
-    public ResponseResult<Object> insertDriver(@Valid ResDataDriveDTO dto, BindingResult bindingResult) {
+    public ResponseResult<Object> insertDriver(@Valid @RequestBody ResDataDriveDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -64,7 +66,7 @@ public class DssFaceController extends BaseController {
     @ApiOperation(("人脸注册"))
     @PostMapping(value = "FaceRegister")
-    public ResponseResult<Object> faceRegister(@Valid FaceRegisterDTO dto, BindingResult bindingResult) {
+    public ResponseResult<Object> faceRegister(@Valid @RequestBody FaceRegisterDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -75,7 +77,7 @@ public class DssFaceController extends BaseController {
     @ApiOperation("人脸校验")
     @PostMapping(value = "FaceCheck")
-    public ResponseResult<FaceCheckVo> faceCheck(@Valid FaceCheckDTO dto, BindingResult bindingResult) {
+    public ResponseResult<FaceCheckVo> faceCheck(@Valid @RequestBody FaceCheckDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
 package com.ruoyi.controller.dss;
+import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.ConstDriverProperties;
+import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.domain.caiinfo.CarInfo;
+import com.ruoyi.domain.dss.key.location.dto.WorkPlateV2DTO;
+import com.ruoyi.domain.dss.key.location.vo.WorkPlateV2Vo;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
-import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
+import com.ruoyi.domain.key.info.KeyInfo;
+import com.ruoyi.domain.key.info.box.dto.KeyBoxQueryDTO;
+import com.ruoyi.domain.key.info.box.vo.KeyBoxVo;
+import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.dss.KeyBoxVoService;
 import com.ruoyi.service.equipment.linke.log.LingangEquipmentLinkeLogService;
+import com.ruoyi.service.key.info.KeyInfoService;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import javax.validation.Valid;
+import java.text.ParseException;
 import java.util.Date;
+import java.util.Objects;
+
 /**
  * @author liujun
  * @date 2024年06月25日 13:04
  */
 @RestController
-@RequestMapping("/dss/keybox")
+@RequestMapping("/dss")
 @Api(tags = "【蓝斯一期】钥匙信息")
 public class KeyBoxController extends BaseController {
@@ -31,16 +51,111 @@ public class KeyBoxController extends BaseController {
     @Autowired
     private KeyBoxVoService keyBoxVoService;
+    @Autowired
+    private LinggangKeyWorkLocationService linggangKeyWorkLocationService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
+    @Autowired
+    private KeyInfoService keyInfoService;
+    @Autowired
+    private CarInfoService carInfoService;
-    @PostMapping(value = "/findKey")
+    @PostMapping(value = "/keybox/findKey")
     @ApiOperation("钥匙信息查询")
-    public ResponseResult listSelect(@RequestBody KeyBoxQueryDTO request) {
-        LingangEquipmentLinkeLog  linkeLog = saveLog(request);
+    public ResponseResult<KeyBoxVo> listSelect(@Valid @RequestBody KeyBoxQueryDTO request,BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        LingangEquipmentLinkeLog linkeLog = saveLog(request);
+
+        return keyBoxVoService.listSelect(request, linkeLog);
+    }
+
+    @PostMapping(value = "/Driver/workPlateV2")
+    @ApiOperation("司机获取当前工作的车辆钥匙信息")
+    public ResponseResult<WorkPlateV2Vo> workPlateV2(@Valid @RequestBody WorkPlateV2DTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        try {
+            LinggangScheduling scheduling = queryScheduling(dto);
+            if (Objects.isNull(scheduling)) {
+                return ResponseResult.error(TipEnum.TIP_3.getCode(), TipEnum.TIP_3.getMsg());
+            }
+            LinggangKeyWorkLocation workLocation = queryKeyWorkLocation(scheduling.getKeyInfoId(), scheduling.getScheduleDate(), dto);
+            if (Objects.isNull(workLocation)) {
+                return ResponseResult.error(TipEnum.TIP_4.getCode(), TipEnum.TIP_4.getMsg());
+            }
+
+            KeyInfo keyInfo = queryKeyInfo(scheduling.getKeyInfoId());
+            if (Objects.isNull(keyInfo)) {
+                return ResponseResult.error(TipEnum.TIP_404.getCode(), TipEnum.TIP_404.getMsg());
+            }
+
+            CarInfo carInfo = queryCarInfo(scheduling.getNbbm());
+            if (Objects.isNull(carInfo)) {
+                return ResponseResult.error(TipEnum.TIP_404.getCode(), TipEnum.TIP_404.getMsg());
+            }
+
+            WorkPlateV2Vo vo = convertWorkPlateV2Vo(scheduling, workLocation, keyInfo, carInfo);
+            return ResponseResult.success(vo);
+        } catch (ParseException e) {
+            logger.error("司机获取当前工作的车辆钥匙信息异常:[{}]", dto, e);
+        }
+
+        return ResponseResult.error();
+
+    }
+
+    /***
+     * 查询排班
+     * @author liujun
+     * @date 2024/7/16 17:05
+     * @param dto
+     * @return com.ruoyi.domain.scheduling.LinggangScheduling
+     */
+    private LinggangScheduling queryScheduling(WorkPlateV2DTO dto) throws ParseException {
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setJobCode(dto.getStaffCode());
+
+        String dateStr = DateUtils.YYYY_MM_DD.format(dto.getTime());
+        scheduling.setScheduleDate(DateUtils.YYYY_MM_DD.parse(dateStr));
+        String bcType = Objects.equals(0, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_OUT : Objects.equals(1, dto.getEventType()) ? ConstDriverProperties.BC_TYPE_IN : "other";
+        scheduling.setBcType(bcType);
-        return keyBoxVoService.listSelect(request,linkeLog);
+        return schedulingService.getOne(scheduling);
     }
     /***
+     * 根据排班时间和钥匙ID查询钥匙
+     * @author liujun
+     * @date 2024/7/16 17:05
+     * @param keyId
+     * @param scheduleDate
+     * @param dto
+     * @return com.ruoyi.domain.key.location.LinggangKeyWorkLocation
+     */
+    private LinggangKeyWorkLocation queryKeyWorkLocation(Integer keyId, Date scheduleDate, WorkPlateV2DTO dto) {
+        LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
+        workLocation.setKeyInfoId(keyId);
+        workLocation.setScheduleDate(scheduleDate);
+        return linggangKeyWorkLocationService.getOne(workLocation);
+    }
+
+    private KeyInfo queryKeyInfo(Integer keyId) {
+        return keyInfoService.getById(keyId);
+    }
+
+    private CarInfo queryCarInfo(String nbbm) {
+        CarInfo carInfo = new CarInfo();
+        carInfo.setNbbm(nbbm);
+
+        return carInfoService.getOne(carInfo);
+    }
+
+
+    /***
      * 保存链接日志
      * @author liujun
      * @date 2024/6/25 15:24
@@ -57,4 +172,15 @@ public class KeyBoxController extends BaseController {
         lingangEquipmentLinkeLogService.save(linkeLog);
         return linkeLog;
     }
+
+    private WorkPlateV2Vo convertWorkPlateV2Vo(LinggangScheduling scheduling, LinggangKeyWorkLocation workLocation, KeyInfo keyInfo, CarInfo carInfo) {
+        WorkPlateV2Vo vo = new WorkPlateV2Vo();
+        vo.setYardId(Convert.toStr(keyInfo.getYardId()));
+//        vo.setYardName(keyInfo.getY)
+        vo.setDevice(workLocation.getDevice());
+        vo.setCabinetNo(workLocation.getCabinetNo());
+        vo.setPlateNum(carInfo.getPlateNum());
+
+        return vo;
+    }
 }
-package com.ruoyi.controller.keyinfo;
+package com.ruoyi.controller.key.info;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.OrderEntity;
-import com.ruoyi.domain.keyInfo.KeyInfo;
-import com.ruoyi.domain.keyInfo.dto.KeyInfoAddDTO;
-import com.ruoyi.domain.keyInfo.dto.KeyInfoQueryDTO;
-import com.ruoyi.domain.keyInfo.dto.KeyInfoUpdateDTO;
-import com.ruoyi.domain.keyInfo.dto.KeyInfoUpdateStatusDTO;
-import com.ruoyi.domain.keyInfo.vo.KeyInfoVO;
+import com.ruoyi.domain.key.info.KeyInfo;
+import com.ruoyi.domain.key.info.dto.KeyInfoAddDTO;
+import com.ruoyi.domain.key.info.dto.KeyInfoQueryDTO;
+import com.ruoyi.domain.key.info.dto.KeyInfoUpdateDTO;
+import com.ruoyi.domain.key.info.dto.KeyInfoUpdateStatusDTO;
+import com.ruoyi.domain.key.info.vo.KeyInfoVO;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import io.swagger.annotations.Api;
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 @Api(tags = "钥匙管理")
 public class KeyInfoController {
     @Autowired
-    private com.ruoyi.service.keyinfo.KeyInfoService KeyInfoService;
+    private com.ruoyi.service.key.info.KeyInfoService KeyInfoService;
     @Autowired
     private IEquipmentService equipmentService;
+package com.ruoyi.controller.key.location;
+
+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.utils.poi.ExcelUtil;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationAddDTO;
+import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationQueryDTO;
+import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationUpdateDTO;
+import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationUpdateStatusDTO;
+import com.ruoyi.domain.key.location.vo.LinggangKeyWorkLocationVO;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+
+@RestController
+@Api(tags = "钥匙存放地址")
+@RequestMapping("linggang/key/work/location")
+public class LinggangKeyWorkLocationController extends BaseController {
+    @Autowired
+    private LinggangKeyWorkLocationService linggangKeyWorkLocationService;
+
+    @ApiOperation("分页查询")
+    @PreAuthorize("@ss.hasPermi('linggang:key:work:location:list:limit:page:limit')")
+    @PostMapping(value = "/list/limit/{page}/{pageLimit}")
+    public IPage<LinggangKeyWorkLocationVO> listLimit(@ModelAttribute LinggangKeyWorkLocationQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+        LinggangKeyWorkLocation entity = convert(request);
+        IPage<LinggangKeyWorkLocation> response = linggangKeyWorkLocationService.pageList(new Page<LinggangKeyWorkLocation>(page, pageLimit), entity, orderEntity);
+
+        return convert(response);
+    }
+
+    @ApiOperation("根据ID查询详情")
+    @GetMapping(value = "/view/{id}")
+    public com.ruoyi.common.core.domain.ResponseResult<LinggangKeyWorkLocationVO> view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
+        LinggangKeyWorkLocation source = linggangKeyWorkLocationService.getById(id);
+
+        return com.ruoyi.common.core.domain.ResponseResult.success(convert(source));
+    }
+
+//    @PostMapping(value = "/list/select")
+//    @ApiOperation("（页面选择）")
+//    public com.ruoyi.common.core.domain.ResponseResult<List<LinggangKeyWorkLocationVO>> listSelect(@RequestBody LinggangKeyWorkLocationQueryDTO request) {
+//        LinggangKeyWorkLocation entity = convert(request);
+//        List<LinggangKeyWorkLocation> selectList = linggangKeyWorkLocationService.listOfSelect(entity);
+//        return  com.ruoyi.common.core.domain.ResponseResult.success(convert(selectList));
+//    }
+
+    @PreAuthorize("@ss.hasPermi('linggang:key:work:location:export')")
+    @ApiOperation("导出")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody LinggangKeyWorkLocationQueryDTO request) {
+        LinggangKeyWorkLocation entity = convert(request);
+        List<LinggangKeyWorkLocation> list = linggangKeyWorkLocationService.list(entity);
+        ExcelUtil<LinggangKeyWorkLocation> util = new ExcelUtil<LinggangKeyWorkLocation>(LinggangKeyWorkLocation.class);
+        util.exportExcel(response, list, "LinggangKeyWorkLocation");
+    }
+
+    @ApiOperation("添加")
+    @PreAuthorize("@ss.hasPermi('linggang:key:work:location:add')")
+    @PostMapping(value = "/add")
+    public com.ruoyi.common.core.domain.ResponseResult add(@Valid @ModelAttribute LinggangKeyWorkLocationAddDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangKeyWorkLocation entity = convert(request);
+        entity.setCreateBy(getUserId());
+        entity.setCreateTime(new Date());
+        int count = linggangKeyWorkLocationService.insertSelective(entity);
+        return count > 0 ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("添加数据失败，请稍后再试");
+    }
+
+    @ApiOperation("修改")
+    @PreAuthorize("@ss.hasPermi('linggang:key:work:location:update')")
+    @PostMapping(value = "/update")
+    public com.ruoyi.common.core.domain.ResponseResult update(@Valid @ModelAttribute LinggangKeyWorkLocationUpdateDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangKeyWorkLocation entity = convert(request);
+        entity.setUpdateBy(getUserId());
+        entity.setUpdateTime(new Date());
+        boolean flag = linggangKeyWorkLocationService.updateByPrimaryKey(entity);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
+    }
+
+    @ApiOperation("修改状态")
+    @PreAuthorize("@ss.hasPermi('linggang:key:work:location:update:status')")
+    @PostMapping(value = "/update/status")
+    public com.ruoyi.common.core.domain.ResponseResult updateState(@ModelAttribute LinggangKeyWorkLocationUpdateStatusDTO request) {
+        LinggangKeyWorkLocation entity = convert(request);
+        boolean flag = linggangKeyWorkLocationService.updateByPrimaryKey(entity);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
+    }
+
+    private LinggangKeyWorkLocation convert(LinggangKeyWorkLocationQueryDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangKeyWorkLocation target = new LinggangKeyWorkLocation();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangKeyWorkLocation convert(LinggangKeyWorkLocationUpdateDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangKeyWorkLocation target = new LinggangKeyWorkLocation();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangKeyWorkLocation convert(LinggangKeyWorkLocationUpdateStatusDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangKeyWorkLocation target = new LinggangKeyWorkLocation();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangKeyWorkLocation convert(LinggangKeyWorkLocationAddDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangKeyWorkLocation target = new LinggangKeyWorkLocation();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private LinggangKeyWorkLocationVO convert(LinggangKeyWorkLocation source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangKeyWorkLocationVO target = new LinggangKeyWorkLocationVO();
+            BeanUtils.copyProperties(source, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private List<LinggangKeyWorkLocationVO> convert(List<LinggangKeyWorkLocation> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            return scs.stream().map(source -> {
+                return convert(source);
+            }).collect(java.util.stream.Collectors.toList());
+        }).orElseGet(null);
+    }
+
+    private IPage<LinggangKeyWorkLocationVO> convert(IPage<LinggangKeyWorkLocation> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            IPage<LinggangKeyWorkLocationVO> target = new Page();
+            BeanUtils.copyProperties(scs, target);
+            List<LinggangKeyWorkLocationVO> voNames = convert(scs.getRecords());
+            target.setRecords(voNames);
+
+            return target;
+        }).orElseGet(null);
+    }
+}
 \ No newline at end of file
 package com.ruoyi.domain.caiinfo;
 import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.annotation.Excel;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
-import com.ruoyi.common.annotation.Excel;
 import java.util.Arrays;
 import java.util.Objects;
@@ -62,6 +61,10 @@ public class CarInfo {
     @TableField(fill = FieldFill.UPDATE)
     private java.util.Date updateTime;
+    /***车辆自编号*/
+    @Excel(name = "车辆自编号")
+    private java.lang.String nbbm;
+
     @Override
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel(value="车辆的新增DTO")
+@ApiModel(value = "车辆的新增DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoAddDTO implements java.io.Serializable {
@@ -37,6 +37,9 @@ public class CarInfoAddDTO implements java.io.Serializable {
     /***修改时间*/
     @ApiModelProperty(value = "修改时间")
     private java.util.Date updateTime;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private java.lang.String nbbm;
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
 package com.ruoyi.domain.caiinfo.dto;
-import com.ruoyi.domain.OrderEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel(value="车辆的查询DTO")
+@ApiModel(value = "车辆的查询DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoQueryDTO implements java.io.Serializable {
@@ -39,6 +38,10 @@ public class CarInfoQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value = "修改时间")
     private java.util.Date updateTime;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private java.lang.String nbbm;
+
     @Override
     public String toString() {
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 @Data
-@ApiModel(value="车辆的修改DTO")
+@ApiModel(value = "车辆的修改DTO")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoUpdateDTO implements java.io.Serializable {
@@ -37,6 +37,10 @@ public class CarInfoUpdateDTO implements java.io.Serializable {
     /***修改时间*/
     @ApiModelProperty(value = "修改时间")
     private java.util.Date updateTime;
+
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private java.lang.String nbbm;
     /***操作人员*/
     @ApiModelProperty(value = "操作人员")
     private String operator;
@@ -4,15 +4,13 @@ import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
 import java.util.Objects;
 @Data
-@ApiModel(value="车辆的VO")
+@ApiModel(value = "车辆的VO")
 @EqualsAndHashCode(callSuper = false)
 public class CarInfoVO implements java.io.Serializable {
     private static final long serialVersionUID = 522735525L;
@@ -42,6 +40,10 @@ public class CarInfoVO implements java.io.Serializable {
     @ApiModelProperty(value = "修改时间")
     private java.util.Date updateTime;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private java.lang.String nbbm;
+
     public String getStatusLabel() {
         return CarInfo.CarStatusEnum.getObjLabel(this.getStatus());
     }
+package com.ruoyi.domain.dss.car.info.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.NotNull;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 15:15
+ */
+@Data
+@ApiModel(value = "模糊查询车辆车牌列表")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class GetPlatesDTO implements java.io.Serializable {
+
+
+    private static final long serialVersionUID = 5997772335057914919L;
+
+    @ApiModelProperty(value = "模糊查询参数，null返回data=nul")
+    private String plate;
+
+    @NotNull(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+}
+package com.ruoyi.domain.dss.key.location.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 javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 15:49
+ */
+@Data
+@ApiModel(value = "司机获取当前工作的车辆钥匙信息DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class WorkPlateV2DTO {
+    @NotNull(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+    @NotNull(message = "设备类型不能为空")
+    @ApiModelProperty(value = "设备类型上线号", required = true)
+    private String deviceType;
+    @NotNull(message = "卡号不能为空")
+    @ApiModelProperty(value = "卡号", required = true)
+    private String driverCode;
+    @NotNull(message = "工号不能为空")
+    @ApiModelProperty(value = "工号", required = true)
+    private String staffCode;
+
+    @NotNull(message = "时间不能为空")
+    @ApiModelProperty(value = "时间", required = true)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date time;
+
+    @NotNull(message = "操作类型不能为空")
+    @ApiModelProperty(value = "操作类型:0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", required = true)
+    private Integer eventType;
+}
+package com.ruoyi.domain.dss.key.location.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 16:13
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "司机获取当前工作的车辆钥匙信息VO")
+public class WorkPlateV2Vo implements java.io.Serializable {
+
+    private static final long serialVersionUID = -7996165129173254421L;
+    @ApiModelProperty(value = "场站ID")
+    private String yardId;
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    @ApiModelProperty(value = "设备上线号")
+    private String device;
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    @ApiModelProperty(value = "车位编码")
+    private String parkingNo;
+    @ApiModelProperty(value = "车牌号")
+    private String plateNum;
+}
+package com.ruoyi.domain.dss.sign.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月16日 14:54
+ */
+@Data
+@ApiModel(value = "校验司机酒测记录是否有效")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssGetWineRecordDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -5875980067011184027L;
+
+    @NotEmpty(message = "工号不能为空")
+    @ApiModelProperty(value = "工号", required = true)
+    private String staffCode;
+    @NotEmpty(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+}
+package com.ruoyi.domain.dss.sign.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.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 14:53
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "校验司机酒测记录是否有效VO")
+public class GetWineRecordVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = -2059500858089061638L;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "最后检测时间")
+    private Date checkTime;
+
+    @ApiModelProperty(value = "是否重新检测")
+    private Boolean check;
+}
-package com.ruoyi.domain.keyInfo;
+package com.ruoyi.domain.key.info;
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-package com.ruoyi.domain.keyInfo.box.dto;
+package com.ruoyi.domain.key.info.box.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotNull;
+
 /**
  * @author liujun
  * @date 2024年06月25日 13:22
@@ -17,16 +19,27 @@ import lombok.experimental.Accessors;
 public class KeyBoxQueryDTO implements java.io.Serializable {
     private static final long serialVersionUID = -1865377310922939750L;
+    @NotNull(message = "设备号  不能为空")
     @ApiModelProperty(value = "设备号", required = true)
     private String device;
+
+    @NotNull(message = "设备类型 不能为空")
     @ApiModelProperty(value = "设备类型", required = true)
     private String deviceType;
+
+    @NotNull(message = " 司机卡号不能为空")
     @ApiModelProperty(value = "司机卡号", required = true)
     private String driverCode;
+
+    @NotNull(message = "工号 不能为空")
     @ApiModelProperty(value = "工号", required = true)
     private String staffCode;
+
+    @NotNull(message = "时间 不能为空")
     @ApiModelProperty(value = "时间", required = true)
     private String time;
+
+    @NotNull(message = " 类型 不能为空")
     @ApiModelProperty(value = "类型：0签到上报获取，1签退归还获取", required = true)
     private String eventType;
 }
-package com.ruoyi.domain.keyInfo.box.vo;
+package com.ruoyi.domain.key.info.box.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-package com.ruoyi.domain.keyInfo.dto;
+package com.ruoyi.domain.key.info.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-package com.ruoyi.domain.keyInfo.dto;
+package com.ruoyi.domain.key.info.dto;
 import com.ruoyi.domain.OrderEntity;
 import io.swagger.annotations.ApiModel;
-package com.ruoyi.domain.keyInfo.dto;
+package com.ruoyi.domain.key.info.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-package com.ruoyi.domain.keyInfo.dto;
+package com.ruoyi.domain.key.info.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-package com.ruoyi.domain.keyInfo.vo;
+package com.ruoyi.domain.key.info.vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+package com.ruoyi.domain.key.location;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+
+@Data
+@Slf4j
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("key_work_location")
+/**钥匙存放地址 实体*/
+public class LinggangKeyWorkLocation {
+    /***ID*/
+    @TableId(value = "id", type = IdType.AUTO)
+    @Excel(name = "ID")
+    private Long id;
+
+
+    /***场站ID*/
+    @Excel(name = "场站ID")
+    private Integer yardId;
+
+
+    /***场站名称*/
+    @Excel(name = "场站名称")
+    private String yardName;
+
+
+    /***设备号*/
+    @Excel(name = "设备号")
+    private String device;
+
+
+    /***钥匙位编号*/
+    @Excel(name = "钥匙位编号")
+    private String cabinetNo;
+
+
+    /***创建人员*/
+    @Excel(name = "创建人员")
+    private Long createBy;
+
+
+    /***创建时间*/
+    @Excel(name = "创建时间")
+    private java.util.Date createTime;
+
+
+    /***修改人员*/
+    @Excel(name = "修改人员")
+    private Long updateBy;
+
+
+    /***修改时间*/
+    @Excel(name = "修改时间")
+    private java.util.Date updateTime;
+
+
+    /***是否删除；0为未删除，1已删除*/
+    @Excel(name = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+
+
+    /***操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息*/
+    @Excel(name = "操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息")
+    private Integer eventType;
+
+
+    /***钥匙ID*/
+    @Excel(name = "钥匙ID")
+    private Integer keyInfoId;
+
+    /***排班时间*/
+    @Excel(name = "排班时间")
+    private java.util.Date scheduleDate;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.key.location.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "钥匙存放地址的添加DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**钥匙存放地址 DTO*/
+public class LinggangKeyWorkLocationAddDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 583473964L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***场站ID*/
+    @ApiModelProperty(value = "场站ID", example = "1")
+    private Integer yardId;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    /***设备号*/
+    @ApiModelProperty(value = "设备号")
+    private String device;
+    /***钥匙位编号*/
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员", example = "1")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员", example = "1")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***是否删除；0为未删除，1已删除*/
+    @ApiModelProperty(value = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+    /***操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息*/
+    @ApiModelProperty(value = "操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", example = "1")
+    private Integer eventType;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+    /***排班时间*/
+    @ApiModelProperty(value="排班时间")
+    private java.util.Date scheduleDate;
+
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.key.location.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "钥匙存放地址的查询DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**钥匙存放地址 DTO*/
+public class LinggangKeyWorkLocationQueryDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 888686851L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***场站ID*/
+    @ApiModelProperty(value = "场站ID", example = "1")
+    private Integer yardId;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    /***设备号*/
+    @ApiModelProperty(value = "设备号")
+    private String device;
+    /***钥匙位编号*/
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员", example = "1")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员", example = "1")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***是否删除；0为未删除，1已删除*/
+    @ApiModelProperty(value = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+    /***操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息*/
+    @ApiModelProperty(value = "操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", example = "1")
+    private Integer eventType;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+    /***排班时间*/
+    @ApiModelProperty(value="排班时间")
+    private java.util.Date scheduleDate;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.key.location.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "钥匙存放地址的修改DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**钥匙存放地址 DTO*/
+public class LinggangKeyWorkLocationUpdateDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 381027569L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***场站ID*/
+    @ApiModelProperty(value = "场站ID", example = "1")
+    private Integer yardId;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    /***设备号*/
+    @ApiModelProperty(value = "设备号")
+    private String device;
+    /***钥匙位编号*/
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员", example = "1")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员", example = "1")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***是否删除；0为未删除，1已删除*/
+    @ApiModelProperty(value = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+    /***操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息*/
+    @ApiModelProperty(value = "操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", example = "1")
+    private Integer eventType;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+    /***排班时间*/
+    @ApiModelProperty(value="排班时间")
+    private java.util.Date scheduleDate;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.key.location.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "钥匙存放地址的修改状态DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**钥匙存放地址 DTO*/
+public class LinggangKeyWorkLocationUpdateStatusDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 754548823L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***场站ID*/
+    @ApiModelProperty(value = "场站ID", example = "1")
+    private Integer yardId;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    /***设备号*/
+    @ApiModelProperty(value = "设备号")
+    private String device;
+    /***钥匙位编号*/
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员", example = "1")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员", example = "1")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***是否删除；0为未删除，1已删除*/
+    @ApiModelProperty(value = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+    /***操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息*/
+    @ApiModelProperty(value = "操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", example = "1")
+    private Integer eventType;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+    /***排班时间*/
+    @ApiModelProperty(value="排班时间")
+    private java.util.Date scheduleDate;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.key.location.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "钥匙存放地址的VO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**钥匙存放地址 VO*/
+public class LinggangKeyWorkLocationVO implements java.io.Serializable {
+    private static final long serialVersionUID = 813918787L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***场站ID*/
+    @ApiModelProperty(value = "场站ID", example = "1")
+    private Integer yardId;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String yardName;
+    /***设备号*/
+    @ApiModelProperty(value = "设备号")
+    private String device;
+    /***钥匙位编号*/
+    @ApiModelProperty(value = "钥匙位编号")
+    private String cabinetNo;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员", example = "1")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员", example = "1")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***是否删除；0为未删除，1已删除*/
+    @ApiModelProperty(value = "是否删除；0为未删除，1已删除")
+    private Boolean delFlag;
+    /***操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息*/
+    @ApiModelProperty(value = "操作类型;0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", example = "1")
+    private Integer eventType;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+    /***排班时间*/
+    @ApiModelProperty(value = "排班时间")
+    private java.util.Date scheduleDate;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.scheduling;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Date;
+
+
+@Data
+@Slf4j
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("scheduling")
+/** 实体*/
+public class LinggangScheduling {
+    /***主键*/
+    @TableId(value = "id", type = IdType.AUTO)
+    @Excel(name = "主键")
+    private Integer id;
+
+
+    /***排班日期*/
+    @Excel(name = "排班日期")
+    private Date scheduleDate;
+
+
+    /***线路名称*/
+    @Excel(name = "线路名称")
+    private String lineName;
+
+
+    /***工号*/
+    @Excel(name = "工号")
+    private String jobCode;
+
+
+    /***姓名*/
+    @Excel(name = "姓名")
+    private String name;
+
+
+    /***工种*/
+    @Excel(name = "工种")
+    private String posts;
+
+
+    /***路牌*/
+    @Excel(name = "路牌")
+    private String lpName;
+
+
+    /***车辆自编号*/
+    @Excel(name = "车辆自编号")
+    private String nbbm;
+
+
+    /***班次类型；in 进站 ；out 出站*/
+    @Excel(name = "班次类型；in 进站 ；out 出站")
+    private String bcType;
+
+
+    /***发车时间*/
+    @Excel(name = "发车时间")
+    private Long fcsjT;
+
+
+    /***到站时间*/
+    @Excel(name = "到站时间")
+    private Long zdsjT;
+
+
+    /***签到表id*/
+    @Excel(name = "签到表id")
+    private Integer signInId;
+
+
+    /***记录状态*/
+    @Excel(name = "记录状态")
+    private Integer exType;
+
+
+    /***打卡时间*/
+    @Excel(name = "打卡时间")
+    private java.util.Date signTime;
+
+
+    /***打卡类型*/
+    @Excel(name = "打卡类型")
+    private Integer signType;
+
+
+    /***是否酒精测试*/
+    @Excel(name = "是否酒精测试")
+    private Integer alcoholFlag;
+
+
+    /***酒精测试含量*/
+    @Excel(name = "酒精测试含量")
+    private java.math.BigDecimal alcoholIntake;
+
+
+    /***原因*/
+    @Excel(name = "原因")
+    private String remark;
+
+
+    /***钥匙ID*/
+    @Excel(name = "钥匙ID")
+    private Integer keyInfoId;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.scheduling.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "排班的添加DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/** DTO*/
+public class LinggangSchedulingAddDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 549270249L;
+
+    /***主键*/
+    @ApiModelProperty(value = "主键", example = "1")
+    private Integer id;
+    /***排班日期*/
+    @ApiModelProperty(value = "排班日期")
+    private Date scheduleDate;
+    /***线路名称*/
+    @ApiModelProperty(value = "线路名称")
+    private String lineName;
+    /***工号*/
+    @ApiModelProperty(value = "工号")
+    private String jobCode;
+    /***姓名*/
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    /***工种*/
+    @ApiModelProperty(value = "工种")
+    private String posts;
+    /***路牌*/
+    @ApiModelProperty(value = "路牌")
+    private String lpName;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private String nbbm;
+    /***班次类型；in 进站 ；out 出站*/
+    @ApiModelProperty(value = "班次类型；in 进站 ；out 出站")
+    private String bcType;
+    /***发车时间*/
+    @ApiModelProperty(value = "发车时间", example = "1")
+    private Long fcsjT;
+    /***到站时间*/
+    @ApiModelProperty(value = "到站时间", example = "1")
+    private Long zdsjT;
+    /***签到表id*/
+    @ApiModelProperty(value = "签到表id", example = "1")
+    private Integer signInId;
+    /***记录状态*/
+    @ApiModelProperty(value = "记录状态", example = "1")
+    private Integer exType;
+    /***打卡时间*/
+    @ApiModelProperty(value = "打卡时间")
+    private java.util.Date signTime;
+    /***打卡类型*/
+    @ApiModelProperty(value = "打卡类型", example = "1")
+    private Integer signType;
+    /***是否酒精测试*/
+    @ApiModelProperty(value = "是否酒精测试", example = "1")
+    private Integer alcoholFlag;
+    /***酒精测试含量*/
+    @ApiModelProperty(value = "酒精测试含量")
+    private java.math.BigDecimal alcoholIntake;
+    /***原因*/
+    @ApiModelProperty(value = "原因")
+    private String remark;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.scheduling.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "排班的查询DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/** DTO*/
+public class LinggangSchedulingQueryDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 884663532L;
+
+    /***主键*/
+    @ApiModelProperty(value = "主键", example = "1")
+    private Integer id;
+    /***排班日期*/
+    @ApiModelProperty(value = "排班日期")
+    private Date scheduleDate;
+    /***线路名称*/
+    @ApiModelProperty(value = "线路名称")
+    private String lineName;
+    /***工号*/
+    @ApiModelProperty(value = "工号")
+    private String jobCode;
+    /***姓名*/
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    /***工种*/
+    @ApiModelProperty(value = "工种")
+    private String posts;
+    /***路牌*/
+    @ApiModelProperty(value = "路牌")
+    private String lpName;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private String nbbm;
+    /***班次类型；in 进站 ；out 出站*/
+    @ApiModelProperty(value = "班次类型；in 进站 ；out 出站")
+    private String bcType;
+    /***发车时间*/
+    @ApiModelProperty(value = "发车时间", example = "1")
+    private Long fcsjT;
+    /***到站时间*/
+    @ApiModelProperty(value = "到站时间", example = "1")
+    private Long zdsjT;
+    /***签到表id*/
+    @ApiModelProperty(value = "签到表id", example = "1")
+    private Integer signInId;
+    /***记录状态*/
+    @ApiModelProperty(value = "记录状态", example = "1")
+    private Integer exType;
+    /***打卡时间*/
+    @ApiModelProperty(value = "打卡时间")
+    private java.util.Date signTime;
+    /***打卡类型*/
+    @ApiModelProperty(value = "打卡类型", example = "1")
+    private Integer signType;
+    /***是否酒精测试*/
+    @ApiModelProperty(value = "是否酒精测试", example = "1")
+    private Integer alcoholFlag;
+    /***酒精测试含量*/
+    @ApiModelProperty(value = "酒精测试含量")
+    private java.math.BigDecimal alcoholIntake;
+    /***原因*/
+    @ApiModelProperty(value = "原因")
+    private String remark;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.scheduling.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "排班的修改DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/** DTO*/
+public class LinggangSchedulingUpdateDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 727765699L;
+
+    /***主键*/
+    @ApiModelProperty(value = "主键", example = "1")
+    private Integer id;
+    /***排班日期*/
+    @ApiModelProperty(value = "排班日期")
+    private Date scheduleDate;
+    /***线路名称*/
+    @ApiModelProperty(value = "线路名称")
+    private String lineName;
+    /***工号*/
+    @ApiModelProperty(value = "工号")
+    private String jobCode;
+    /***姓名*/
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    /***工种*/
+    @ApiModelProperty(value = "工种")
+    private String posts;
+    /***路牌*/
+    @ApiModelProperty(value = "路牌")
+    private String lpName;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private String nbbm;
+    /***班次类型；in 进站 ；out 出站*/
+    @ApiModelProperty(value = "班次类型；in 进站 ；out 出站")
+    private String bcType;
+    /***发车时间*/
+    @ApiModelProperty(value = "发车时间", example = "1")
+    private Long fcsjT;
+    /***到站时间*/
+    @ApiModelProperty(value = "到站时间", example = "1")
+    private Long zdsjT;
+    /***签到表id*/
+    @ApiModelProperty(value = "签到表id", example = "1")
+    private Integer signInId;
+    /***记录状态*/
+    @ApiModelProperty(value = "记录状态", example = "1")
+    private Integer exType;
+    /***打卡时间*/
+    @ApiModelProperty(value = "打卡时间")
+    private java.util.Date signTime;
+    /***打卡类型*/
+    @ApiModelProperty(value = "打卡类型", example = "1")
+    private Integer signType;
+    /***是否酒精测试*/
+    @ApiModelProperty(value = "是否酒精测试", example = "1")
+    private Integer alcoholFlag;
+    /***酒精测试含量*/
+    @ApiModelProperty(value = "酒精测试含量")
+    private java.math.BigDecimal alcoholIntake;
+    /***原因*/
+    @ApiModelProperty(value = "原因")
+    private String remark;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.scheduling.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel(value = "排班的VO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/** VO*/
+public class LinggangSchedulingVO implements java.io.Serializable {
+    private static final long serialVersionUID = 427513728L;
+
+    /***主键*/
+    @ApiModelProperty(value = "主键", example = "1")
+    private Integer id;
+    /***排班日期*/
+    @ApiModelProperty(value = "排班日期")
+    private Date scheduleDate;
+    /***线路名称*/
+    @ApiModelProperty(value = "线路名称")
+    private String lineName;
+    /***工号*/
+    @ApiModelProperty(value = "工号")
+    private String jobCode;
+    /***姓名*/
+    @ApiModelProperty(value = "姓名")
+    private String name;
+    /***工种*/
+    @ApiModelProperty(value = "工种")
+    private String posts;
+    /***路牌*/
+    @ApiModelProperty(value = "路牌")
+    private String lpName;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private String nbbm;
+    /***班次类型；in 进站 ；out 出站*/
+    @ApiModelProperty(value = "班次类型；in 进站 ；out 出站")
+    private String bcType;
+    /***发车时间*/
+    @ApiModelProperty(value = "发车时间", example = "1")
+    private Long fcsjT;
+    /***到站时间*/
+    @ApiModelProperty(value = "到站时间", example = "1")
+    private Long zdsjT;
+    /***签到表id*/
+    @ApiModelProperty(value = "签到表id", example = "1")
+    private Integer signInId;
+    /***记录状态*/
+    @ApiModelProperty(value = "记录状态", example = "1")
+    private Integer exType;
+    /***打卡时间*/
+    @ApiModelProperty(value = "打卡时间")
+    private java.util.Date signTime;
+    /***打卡类型*/
+    @ApiModelProperty(value = "打卡类型", example = "1")
+    private Integer signType;
+    /***是否酒精测试*/
+    @ApiModelProperty(value = "是否酒精测试", example = "1")
+    private Integer alcoholFlag;
+    /***酒精测试含量*/
+    @ApiModelProperty(value = "酒精测试含量")
+    private java.math.BigDecimal alcoholIntake;
+    /***原因*/
+    @ApiModelProperty(value = "原因")
+    private String remark;
+    /***钥匙ID*/
+    @ApiModelProperty(value = "钥匙ID", example = "1")
+    private Integer keyInfoId;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
@@ -3,7 +3,6 @@ package com.ruoyi.equipment.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
 package com.ruoyi.in.mapper;
-import java.util.List;
-import com.ruoyi.in.domain.SignIn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.DriverScheduling;
-import com.ruoyi.pojo.request.ReportViewRequestVo;
+import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.request.ReportErrorRequestVo;
+import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.pojo.response.SignInResponseVo;
+import java.util.List;
+
 /**
  * 签到Mapper接口
  * 
  * @author guzijian
  * @date 2023-07-05
  */
-public interface SignInMapper 
+public interface SignInMapper extends BaseMapper<SignIn>
 {
     /**
      * 查询签到
 package com.ruoyi.in.service;
-import java.io.IOException;
-import java.util.List;
-
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.FileUploadException;
 import com.ruoyi.domain.driver.NewDriver;
@@ -10,6 +8,8 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.response.SignInResponseVo;
 import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.List;
 /**
  * 签到Service接口
@@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author guzijian
  * @date 2023-07-05
  */
-public interface ISignInService {
+public interface ISignInService extends IService<SignIn> {
     /**
      * 查询签到
      *
@@ -34,6 +34,8 @@ public interface ISignInService {
      */
     public List<SignInResponseVo> selectSignInList(SignInResponseVo signIn);
+    SignIn getLastOne(SignIn signIn);
+
     /**
      * 修改签到
      *
 package com.ruoyi.in.service.impl;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.cache.SchedulingCache;
 import com.ruoyi.common.cache.TempCache;
@@ -25,6 +17,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
@@ -32,29 +25,39 @@ import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.errorScheduling.service.IErrorJobcodeService;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.in.mapper.SignInMapper;
-import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.in.service.ISignInService;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 import static com.ruoyi.common.ConstDriverProperties.*;
-import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.ErrorTypeProperties.*;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW;
 /**
@@ -64,7 +67,7 @@ import static com.ruoyi.common.redispre.GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_
  * @date 2023-07-05
  */
 @Service
-public class SignInServiceImpl implements ISignInService {
+public class SignInServiceImpl extends ServiceImpl<SignInMapper, SignIn> implements ISignInService {
     private Logger log = LoggerFactory.getLogger(SignInServiceImpl.class);
@@ -120,6 +123,16 @@ public class SignInServiceImpl implements ISignInService {
         return vos;
     }
+    @Override
+    public SignIn getLastOne(SignIn signIn) {
+        LambdaQueryWrapper<SignIn> wrapper = new LambdaQueryWrapper<>(signIn);
+        wrapper.orderByDesc(SignIn::getCreateTime);
+
+        PageHelper.startPage(1, 1, false);
+        List<SignIn> signIns = list(wrapper);
+        return CollectionUtils.isEmpty(signIns) ? null : signIns.get(0);
+    }
+
     /**
      * 修改签到
-package com.ruoyi.mapper.keyinfo;
+package com.ruoyi.mapper.key.info;
-import com.ruoyi.domain.keyInfo.KeyInfo;
+import com.ruoyi.domain.key.info.KeyInfo;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+package com.ruoyi.mapper.key.location;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+/**钥匙存放地址 Mapper接口*/
+public interface LinggangKeyWorkLocationMapper extends BaseMapper<LinggangKeyWorkLocation> {
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangKeyWorkLocation name);
+}
 \ No newline at end of file
+package com.ruoyi.mapper.scheduling;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+/** Mapper接口*/
+public interface LinggangSchedulingMapper extends BaseMapper<LinggangScheduling> {
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangScheduling name);
+}
 \ No newline at end of file
@@ -20,6 +20,8 @@ public interface CarInfoService extends IService&lt;CarInfo&gt; {
      */
     List<CarInfo> list(CarInfo entity);
+    List<CarInfo> likePlateNumPlateNumTop30(CarInfo entity);
+
     /***
      *用于页面选择
      */
@@ -2,7 +2,8 @@ package com.ruoyi.service.dss;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
-import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
+import com.ruoyi.domain.key.info.box.dto.KeyBoxQueryDTO;
+import com.ruoyi.domain.key.info.box.vo.KeyBoxVo;
 /**
@@ -11,5 +12,5 @@ import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
  */
 public interface KeyBoxVoService {
     /**钥匙信息查询*/
-    ResponseResult listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog);
+    ResponseResult<KeyBoxVo> listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog);
 }
@@ -55,6 +55,20 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
     }
     @Override
+    public List<CarInfo> likePlateNumPlateNumTop30(CarInfo entity) {
+        String plateNum = entity.getPlateNum();
+        entity.setPlateNum(null);
+
+        LambdaQueryWrapper<CarInfo> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(CarInfo::getPlateNum);
+        wrapper.like(CarInfo::getPlateNum, plateNum);
+        wrapper.groupBy(CarInfo::getPlateNum);
+
+        PageHelper.startPage(1, 30, false);
+        return list(wrapper);
+    }
+
+    @Override
     public List<CarInfo> listOfSelect(CarInfo entity) {
         LambdaQueryWrapper<CarInfo> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(CarInfo::getId, CarInfo::getPlateNum);
@@ -173,7 +187,7 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
                 wrapper.orderByDesc(CarInfo::getUpdateTime);
             }
-        }else{
+        } else {
             wrapper.orderByDesc(CarInfo::getCreateTime);
         }
     }
@@ -6,9 +6,9 @@ import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
-import com.ruoyi.domain.keyInfo.KeyInfo;
-import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
-import com.ruoyi.domain.keyInfo.box.vo.KeyBoxVo;
+import com.ruoyi.domain.key.info.KeyInfo;
+import com.ruoyi.domain.key.info.box.dto.KeyBoxQueryDTO;
+import com.ruoyi.domain.key.info.box.vo.KeyBoxVo;
 import com.ruoyi.domain.lin.gang.LingangScheduling;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
@@ -17,7 +17,7 @@ import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.dss.KeyBoxVoService;
 import com.ruoyi.service.equipment.linke.log.LingangEquipmentLinkeLogService;
-import com.ruoyi.service.keyinfo.KeyInfoService;
+import com.ruoyi.service.key.info.KeyInfoService;
 import com.ruoyi.service.lin.gang.LingangSchedulingService;
 import com.ruoyi.utils.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +46,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
     private LingangEquipmentLinkeLogService lingangEquipmentLinkeLogService;
     @Override
-    public ResponseResult listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog) {
+    public ResponseResult<KeyBoxVo> listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog) {
         LingangScheduling lingangScheduling = queryScheduling(request);
         if (Objects.isNull(lingangScheduling)) {
             String msg = MessageFormat.format("工号[{0}]在[{1}]没有排班信息", request.getStaffCode(), request.getTime());
-package com.ruoyi.service.impl.keyinfo;
+package com.ruoyi.service.impl.key.info;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.domain.OrderEntity;
-import com.ruoyi.domain.keyInfo.KeyInfo;
-import com.ruoyi.service.keyinfo.KeyInfoService;
+import com.ruoyi.domain.key.info.KeyInfo;
+import com.ruoyi.service.key.info.KeyInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -17,9 +17,9 @@ import java.util.List;
 @Service
-public class KeyInfoServiceImpl extends ServiceImpl<com.ruoyi.mapper.keyinfo.KeyInfoMapper, KeyInfo> implements KeyInfoService {
+public class KeyInfoServiceImpl extends ServiceImpl<com.ruoyi.mapper.key.info.KeyInfoMapper, KeyInfo> implements KeyInfoService {
     @Autowired
-    private com.ruoyi.mapper.keyinfo.KeyInfoMapper KeyInfoMapper;
+    private com.ruoyi.mapper.key.info.KeyInfoMapper KeyInfoMapper;
     /**
+package com.ruoyi.service.impl.key.location;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import com.ruoyi.mapper.key.location.LinggangKeyWorkLocationMapper;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+/**钥匙存放地址 Service实现类*/
+public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl<LinggangKeyWorkLocationMapper, LinggangKeyWorkLocation> implements LinggangKeyWorkLocationService {
+    @Autowired
+    private LinggangKeyWorkLocationMapper linggangKeyWorkLocationMapper;
+
+    /**
+     * 分页查询
+     */
+    @Override
+    public IPage<LinggangKeyWorkLocation> pageList(Page<LinggangKeyWorkLocation> page, LinggangKeyWorkLocation entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> countWrapper = new LambdaQueryWrapper<>(entity);
+        countWrapper.select(LinggangKeyWorkLocation::getId);
+        int count = count(countWrapper);
+
+        List<LinggangKeyWorkLocation> lists = Collections.emptyList();
+        if (count > 0) {
+            PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
+            LambdaQueryWrapper<LinggangKeyWorkLocation> selectWrapper = new LambdaQueryWrapper<>(entity);
+            orderColumn(selectWrapper, orderEntity);
+            lists = list(selectWrapper);
+        }
+
+        IPage<LinggangKeyWorkLocation> returnPage = new Page<LinggangKeyWorkLocation>();
+        returnPage.setRecords(lists);
+        returnPage.setPages(count % page.getSize() == 0 ? count / page.getSize() : count / page.getSize() + 1);
+        returnPage.setCurrent(page.getCurrent());
+        returnPage.setSize(page.getSize());
+        returnPage.setTotal(count);
+
+        return returnPage;
+    }
+
+    @Override
+    public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
+        return list(new LambdaQueryWrapper<>(entity));
+    }
+    // @Override
+    // public List<LinggangKeyWorkLocation> listOfSelect(LinggangKeyWorkLocation entity) {
+    //      LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+    //     wrapper.select(LinggangKeyWorkLocation::, LinggangKeyWorkLocation::);
+    //      return list(wrapper);
+    //  }
+
+    // @Override
+    // public List<LinggangKeyWorkLocation> listOfIds(java.util.Collection<java.lang.Long> ids) {
+    //     if (org.springframework.util.CollectionUtils.isEmpty(ids)) {
+    //         return java.util.Collections.emptyList();
+    //    }
+    //   LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>();
+    //   wrapper.select(LinggangKeyWorkLocation::getId,LinggangKeyWorkLocation::);
+    //   wrapper.in(LinggangKeyWorkLocation::getId, ids);
+    //   return list(wrapper);
+    // }
+
+    @Override
+    public LinggangKeyWorkLocation getOne(LinggangKeyWorkLocation entity) {
+        return getOne(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public Integer countId(LinggangKeyWorkLocation entity) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(LinggangKeyWorkLocation::getId);
+        return count(wrapper);
+    }
+
+
+    /**
+     * 插入有值的列
+     */
+    @Override
+    public int insertSelective(LinggangKeyWorkLocation entity) {
+        return linggangKeyWorkLocationMapper.insertSelective(entity);
+    }
+
+    /**
+     * 插入数据
+     */
+    @Override
+    public boolean insert(LinggangKeyWorkLocation entity) {
+        return save(entity);
+    }
+
+    /**
+     * 根据主键修改数据
+     */
+    @Override
+    public boolean updateByPrimaryKey(LinggangKeyWorkLocation entity) {
+        return updateById(entity);
+    }
+
+    /***根据主键删除数据*/
+    @Override
+    public boolean deleteById(Long id) {
+        return removeById(id);
+    }
+
+
+    public static void orderColumn(LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper, OrderEntity orderEntity) {
+        if (org.apache.commons.lang3.StringUtils.equals("ascending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "yardId")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getYardId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "yardName")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getYardName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "device")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getDevice);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "cabinetNo")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getCabinetNo);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkingNo")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getParkingNo);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "carInfoId")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getCarInfoId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getCreateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "delFlag")) {
+                wrapper.orderByAsc(LinggangKeyWorkLocation::getDelFlag);
+            }
+        } else if (org.apache.commons.lang3.StringUtils.equals("descending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "yardId")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getYardId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "yardName")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getYardName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "device")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getDevice);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "cabinetNo")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getCabinetNo);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkingNo")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getParkingNo);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "carInfoId")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getCarInfoId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getCreateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "delFlag")) {
+                wrapper.orderByDesc(LinggangKeyWorkLocation::getDelFlag);
+            }
+        } else {
+            wrapper.orderByDesc(LinggangKeyWorkLocation::getId);
+        }
+    }
+}
 \ No newline at end of file
+package com.ruoyi.service.impl.scheduling;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.mapper.scheduling.LinggangSchedulingMapper;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+/** Service实现类*/
+public class LinggangSchedulingServiceImpl extends ServiceImpl<LinggangSchedulingMapper, LinggangScheduling> implements LinggangSchedulingService {
+    @Autowired
+    private LinggangSchedulingMapper linggangSchedulingMapper;
+
+    /**
+     * 分页查询
+     */
+    @Override
+    public IPage<LinggangScheduling> pageList(Page<LinggangScheduling> page, LinggangScheduling entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<LinggangScheduling> countWrapper = new LambdaQueryWrapper<>(entity);
+        countWrapper.select(LinggangScheduling::getId);
+        int count = count(countWrapper);
+
+        List<LinggangScheduling> lists = Collections.emptyList();
+        if (count > 0) {
+            PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
+            LambdaQueryWrapper<LinggangScheduling> selectWrapper = new LambdaQueryWrapper<>(entity);
+            orderColumn(selectWrapper, orderEntity);
+            lists = list(selectWrapper);
+        }
+
+        IPage<LinggangScheduling> returnPage = new Page<LinggangScheduling>();
+        returnPage.setRecords(lists);
+        returnPage.setPages(count % page.getSize() == 0 ? count / page.getSize() : count / page.getSize() + 1);
+        returnPage.setCurrent(page.getCurrent());
+        returnPage.setSize(page.getSize());
+        returnPage.setTotal(count);
+
+        return returnPage;
+    }
+
+    @Override
+    public List<LinggangScheduling> list(LinggangScheduling entity) {
+        return list(new LambdaQueryWrapper<>(entity));
+    }
+    // @Override
+    // public List<LinggangScheduling> listOfSelect(LinggangScheduling entity) {
+    //      LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+    //     wrapper.select(LinggangScheduling::, LinggangScheduling::);
+    //      return list(wrapper);
+    //  }
+
+    // @Override
+    // public List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids) {
+    //     if (org.springframework.util.CollectionUtils.isEmpty(ids)) {
+    //         return java.util.Collections.emptyList();
+    //    }
+    //   LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>();
+    //   wrapper.select(LinggangScheduling::getId,LinggangScheduling::);
+    //   wrapper.in(LinggangScheduling::getId, ids);
+    //   return list(wrapper);
+    // }
+
+    @Override
+    public LinggangScheduling getOne(LinggangScheduling entity) {
+        return getOne(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public Integer countId(LinggangScheduling entity) {
+        LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(LinggangScheduling::getId);
+        return count(wrapper);
+    }
+
+
+    /**
+     * 插入有值的列
+     */
+    @Override
+    public int insertSelective(LinggangScheduling entity) {
+        return linggangSchedulingMapper.insertSelective(entity);
+    }
+
+    /**
+     * 插入数据
+     */
+    @Override
+    public boolean insert(LinggangScheduling entity) {
+        return save(entity);
+    }
+
+    /**
+     * 根据主键修改数据
+     */
+    @Override
+    public boolean updateByPrimaryKey(LinggangScheduling entity) {
+        return updateById(entity);
+    }
+
+    /***根据主键删除数据*/
+    @Override
+    public boolean deleteById(Integer id) {
+        return removeById(id);
+    }
+
+
+    public static void orderColumn(LambdaQueryWrapper<LinggangScheduling> wrapper, OrderEntity orderEntity) {
+        if (org.apache.commons.lang3.StringUtils.equals("ascending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByAsc(LinggangScheduling::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "scheduleDate")) {
+                wrapper.orderByAsc(LinggangScheduling::getScheduleDate);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineName")) {
+                wrapper.orderByAsc(LinggangScheduling::getLineName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "jobCode")) {
+                wrapper.orderByAsc(LinggangScheduling::getJobCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "name")) {
+                wrapper.orderByAsc(LinggangScheduling::getName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "posts")) {
+                wrapper.orderByAsc(LinggangScheduling::getPosts);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lpName")) {
+                wrapper.orderByAsc(LinggangScheduling::getLpName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "nbbm")) {
+                wrapper.orderByAsc(LinggangScheduling::getNbbm);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "bcType")) {
+                wrapper.orderByAsc(LinggangScheduling::getBcType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fcsjT")) {
+                wrapper.orderByAsc(LinggangScheduling::getFcsjT);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "zdsjT")) {
+                wrapper.orderByAsc(LinggangScheduling::getZdsjT);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signInId")) {
+                wrapper.orderByAsc(LinggangScheduling::getSignInId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "exType")) {
+                wrapper.orderByAsc(LinggangScheduling::getExType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signTime")) {
+                wrapper.orderByAsc(LinggangScheduling::getSignTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signType")) {
+                wrapper.orderByAsc(LinggangScheduling::getSignType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "alcoholFlag")) {
+                wrapper.orderByAsc(LinggangScheduling::getAlcoholFlag);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "alcoholIntake")) {
+                wrapper.orderByAsc(LinggangScheduling::getAlcoholIntake);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "remark")) {
+                wrapper.orderByAsc(LinggangScheduling::getRemark);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "keyInfoId")) {
+                wrapper.orderByAsc(LinggangScheduling::getKeyInfoId);
+            }
+        } else if (org.apache.commons.lang3.StringUtils.equals("descending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByDesc(LinggangScheduling::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "scheduleDate")) {
+                wrapper.orderByDesc(LinggangScheduling::getScheduleDate);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineName")) {
+                wrapper.orderByDesc(LinggangScheduling::getLineName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "jobCode")) {
+                wrapper.orderByDesc(LinggangScheduling::getJobCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "name")) {
+                wrapper.orderByDesc(LinggangScheduling::getName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "posts")) {
+                wrapper.orderByDesc(LinggangScheduling::getPosts);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lpName")) {
+                wrapper.orderByDesc(LinggangScheduling::getLpName);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "nbbm")) {
+                wrapper.orderByDesc(LinggangScheduling::getNbbm);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "bcType")) {
+                wrapper.orderByDesc(LinggangScheduling::getBcType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fcsjT")) {
+                wrapper.orderByDesc(LinggangScheduling::getFcsjT);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "zdsjT")) {
+                wrapper.orderByDesc(LinggangScheduling::getZdsjT);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signInId")) {
+                wrapper.orderByDesc(LinggangScheduling::getSignInId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "exType")) {
+                wrapper.orderByDesc(LinggangScheduling::getExType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signTime")) {
+                wrapper.orderByDesc(LinggangScheduling::getSignTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signType")) {
+                wrapper.orderByDesc(LinggangScheduling::getSignType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "alcoholFlag")) {
+                wrapper.orderByDesc(LinggangScheduling::getAlcoholFlag);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "alcoholIntake")) {
+                wrapper.orderByDesc(LinggangScheduling::getAlcoholIntake);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "remark")) {
+                wrapper.orderByDesc(LinggangScheduling::getRemark);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "keyInfoId")) {
+                wrapper.orderByDesc(LinggangScheduling::getKeyInfoId);
+            }
+        } else {
+            wrapper.orderByDesc(LinggangScheduling::getId);
+        }
+    }
+}
 \ No newline at end of file
-package com.ruoyi.service.keyinfo;
+package com.ruoyi.service.key.info;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.domain.OrderEntity;
-import com.ruoyi.domain.keyInfo.KeyInfo;
+import com.ruoyi.domain.key.info.KeyInfo;
 import java.util.List;
+package com.ruoyi.service.key.location;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+
+import java.util.List;
+
+
+/**
+ * 钥匙存放地址 Service接口
+ */
+public interface LinggangKeyWorkLocationService extends IService<LinggangKeyWorkLocation> {
+    /**
+     * 分页查询
+     */
+    IPage<LinggangKeyWorkLocation> pageList(com.baomidou.mybatisplus.extension.plugins.pagination.Page<LinggangKeyWorkLocation> page, LinggangKeyWorkLocation entity, OrderEntity orderEntity);
+
+    /**
+     * 带条件查询
+     */
+    List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity);
+
+    // List<LinggangKeyWorkLocation> listOfIds(java.util.Collection<java.lang.Long> ids);
+    // /***
+    // *用于页面选择
+    // */
+    // List<LinggangKeyWorkLocation> listOfSelect(LinggangKeyWorkLocation entity);
+
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    LinggangKeyWorkLocation getOne(LinggangKeyWorkLocation entity);
+
+    Integer countId(LinggangKeyWorkLocation entity);
+
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangKeyWorkLocation entity);
+
+    /***插入数据*/
+    boolean insert(LinggangKeyWorkLocation entity);
+
+    /**
+     * 根据主键修改数据
+     */
+    boolean updateByPrimaryKey(LinggangKeyWorkLocation entity);
+
+    boolean deleteById(Long id);
+
+}
 \ No newline at end of file
+package com.ruoyi.service.scheduling;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+
+import java.util.List;
+
+
+/**
+ * Service接口
+ */
+public interface LinggangSchedulingService extends IService<LinggangScheduling> {
+    /**
+     * 分页查询
+     */
+    IPage<LinggangScheduling> pageList(com.baomidou.mybatisplus.extension.plugins.pagination.Page<LinggangScheduling> page, LinggangScheduling entity, OrderEntity orderEntity);
+
+    /**
+     * 带条件查询
+     */
+    List<LinggangScheduling> list(LinggangScheduling entity);
+
+    // List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids);
+    // /***
+    // *用于页面选择
+    // */
+    // List<LinggangScheduling> listOfSelect(LinggangScheduling entity);
+
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    LinggangScheduling getOne(LinggangScheduling entity);
+
+    Integer countId(LinggangScheduling entity);
+
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangScheduling entity);
+
+    /***插入数据*/
+    boolean insert(LinggangScheduling entity);
+
+    /**
+     * 根据主键修改数据
+     */
+    boolean updateByPrimaryKey(LinggangScheduling entity);
+
+    boolean deleteById(Integer id);
+}
 \ No newline at end of file
@@ -6,10 +6,11 @@
         <result column="plate_Num" jdbcType="VARCHAR" property="plateNum"/>
         <result column="parking_No" jdbcType="VARCHAR" property="parkingNo"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
-        <result column="create_By" jdbcType="INTEGER" property="createBy"/>
+        <result column="create_By" jdbcType="VARCHAR" property="createBy"/>
         <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="update_by" jdbcType="INTEGER" property="updateBy"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
         <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="nbbm" jdbcType="VARCHAR" property="nbbm"/>
     </resultMap>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
@@ -21,12 +22,12 @@
     <sql id="columns">
         id
-        ,  plate_Num   ,  parking_No   ,  status   ,  create_By   ,  create_time   ,  update_by   ,  update_time
+        ,  plate_Num   ,  parking_No   ,  status   ,  create_By   ,  create_time   ,  update_by   ,  update_time   ,  nbbm
     </sql>
     <sql id="insert_columns">
         id
-        ,  plate_Num  ,  parking_No  ,  status  ,  create_By  ,  create_time  ,  update_by  ,  update_time
+        ,  plate_Num  ,  parking_No  ,  status  ,  create_By  ,  create_time  ,  update_by  ,  update_time  ,  nbbm
     </sql>
     <sql id="insert_values">
@@ -38,7 +39,8 @@
         #{createBy},
         #{createTime},
         #{updateBy},
-        #{updateTime}
+        #{updateTime},
+        #{nbbm}
     </sql>
     <sql id="insertSelectiveColumn">
@@ -51,6 +53,7 @@
             <if test="null!=createTime">create_time,</if>
             <if test="null!=updateBy">update_by,</if>
             <if test="null!=updateTime">update_time,</if>
+            <if test="null!=nbbm">nbbm,</if>
         </trim>
     </sql>
@@ -64,6 +67,7 @@
             <if test="null!=createTime">#{createTime,jdbcType=TIMESTAMP},</if>
             <if test="null!=updateBy">#{updateBy,jdbcType=VARCHAR},</if>
             <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=nbbm">#{nbbm,jdbcType=VARCHAR},</if>
         </trim>
     </sql>
@@ -77,6 +81,7 @@
             <if test="null!=createTime">create_time = #{createTime,jdbcType=TIMESTAMP},</if>
             <if test="null!=updateBy">update_by = #{updateBy,jdbcType=VARCHAR},</if>
             <if test="null!=updateTime">update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=nbbm">nbbm = #{nbbm,jdbcType=VARCHAR},</if>
         </set>
     </sql>
@@ -89,5 +94,6 @@
         <if test="null!=createTime">AND create_time = #{createTime,jdbcType=TIMESTAMP},</if>
         <if test="null!=updateBy">AND update_by = #{updateBy,jdbcType=VARCHAR},</if>
         <if test="null!=updateTime">AND update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=nbbm">AND nbbm = #{nbbm,jdbcType=VARCHAR},</if>
     </sql>
 </mapper>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.mapper.keyinfo.KeyInfoMapper">
-    <resultMap id="BaseResultMap" type="com.ruoyi.domain.keyInfo.KeyInfo">
+<mapper namespace="com.ruoyi.mapper.key.info.KeyInfoMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.key.info.KeyInfo">
         <id column="id" jdbcType="INTEGER" property="id"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="status" jdbcType="INTEGER" property="status"/>
@@ -17,7 +17,7 @@
     </resultMap>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
-            parameterType="com.ruoyi.domain.keyInfo.KeyInfo">
+            parameterType="com.ruoyi.domain.key.info.KeyInfo">
         INSERT INTO key_info <include refid="insertSelectiveColumn"></include>
         <include refid="insertSelectiveValue"></include>
     </insert>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.key.location.LinggangKeyWorkLocationMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.key.location.LinggangKeyWorkLocation">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="yard_Id" jdbcType="INTEGER" property="yardId"/>
+        <result column="yard_Name" jdbcType="VARCHAR" property="yardName"/>
+        <result column="device" jdbcType="VARCHAR" property="device"/>
+        <result column="cabinet_No" jdbcType="VARCHAR" property="cabinetNo"/>
+        <result column="create_by" jdbcType="BIGINT" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="BIGINT" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="del_flag" jdbcType="BIT" property="delFlag"/>
+        <result column="event_Type" jdbcType="INTEGER" property="eventType"/>
+        <result column="key_info_id" jdbcType="INTEGER" property="keyInfoId"/>
+        <result column="schedule_date" jdbcType="TIMESTAMP" property="scheduleDate"/>
+    </resultMap>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ruoyi.domain.key.location.LinggangKeyWorkLocation">
+        INSERT INTO key_work_location <include refid="insertSelectiveColumn"></include>
+        <include refid="insertSelectiveValue"></include>
+    </insert>
+
+    <sql id="columns">
+        id
+        ,  yard_Id   ,  yard_Name   ,  device   ,  cabinet_No   ,  create_by   ,  create_time   ,  update_by   ,  update_time   ,  del_flag   ,  event_Type   ,  key_info_id   ,  schedule_date
+    </sql>
+
+    <sql id="insert_columns">
+        id
+        ,  yard_Id  ,  yard_Name  ,  device  ,  cabinet_No  ,  create_by  ,  create_time  ,  update_by  ,  update_time  ,  del_flag  ,  event_Type  ,  key_info_id  ,  schedule_date
+    </sql>
+
+    <sql id="insert_values">
+        #{id}
+        ,
+        #{yardId},
+        #{yardName},
+        #{device},
+        #{cabinetNo},
+        #{createBy},
+        #{createTime},
+        #{updateBy},
+        #{updateTime},
+        #{delFlag},
+        #{eventType},
+        #{keyInfoId},
+        #{scheduleDate}
+    </sql>
+
+    <sql id="insertSelectiveColumn">
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null!=id">id,</if>
+            <if test="null!=yardId">yard_Id,</if>
+            <if test="null!=yardName">yard_Name,</if>
+            <if test="null!=device">device,</if>
+            <if test="null!=cabinetNo">cabinet_No,</if>
+            <if test="null!=createBy">create_by,</if>
+            <if test="null!=createTime">create_time,</if>
+            <if test="null!=updateBy">update_by,</if>
+            <if test="null!=updateTime">update_time,</if>
+            <if test="null!=delFlag">del_flag,</if>
+            <if test="null!=eventType">event_Type,</if>
+            <if test="null!=keyInfoId">key_info_id,</if>
+            <if test="null!=scheduleDate">schedule_date,</if>
+        </trim>
+    </sql>
+
+    <sql id="insertSelectiveValue">
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null!=id">#{id,jdbcType=BIGINT},</if>
+            <if test="null!=yardId">#{yardId,jdbcType=INTEGER},</if>
+            <if test="null!=yardName">#{yardName,jdbcType=VARCHAR},</if>
+            <if test="null!=device">#{device,jdbcType=VARCHAR},</if>
+            <if test="null!=cabinetNo">#{cabinetNo,jdbcType=VARCHAR},</if>
+            <if test="null!=createBy">#{createBy,jdbcType=BIGINT},</if>
+            <if test="null!=createTime">#{createTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=updateBy">#{updateBy,jdbcType=BIGINT},</if>
+            <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=delFlag">#{delFlag,jdbcType=BIT},</if>
+            <if test="null!=eventType">#{eventType,jdbcType=INTEGER},</if>
+            <if test="null!=keyInfoId">#{keyInfoId,jdbcType=INTEGER},</if>
+            <if test="null!=scheduleDate">#{scheduleDate,jdbcType=TIMESTAMP},</if>
+        </trim>
+    </sql>
+
+    <sql id="updateByPrimaryKeySelectiveSql">
+        <set>
+            <if test="null!=id">id = #{id,jdbcType=BIGINT},</if>
+            <if test="null!=yardId">yard_Id = #{yardId,jdbcType=INTEGER},</if>
+            <if test="null!=yardName">yard_Name = #{yardName,jdbcType=VARCHAR},</if>
+            <if test="null!=device">device = #{device,jdbcType=VARCHAR},</if>
+            <if test="null!=cabinetNo">cabinet_No = #{cabinetNo,jdbcType=VARCHAR},</if>
+            <if test="null!=createBy">create_by = #{createBy,jdbcType=BIGINT},</if>
+            <if test="null!=createTime">create_time = #{createTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=updateBy">update_by = #{updateBy,jdbcType=BIGINT},</if>
+            <if test="null!=updateTime">update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=delFlag">del_flag = #{delFlag,jdbcType=BIT},</if>
+            <if test="null!=eventType">event_Type = #{eventType,jdbcType=INTEGER},</if>
+            <if test="null!=keyInfoId">key_info_id = #{keyInfoId,jdbcType=INTEGER},</if>
+            <if test="null!=scheduleDate">schedule_date = #{scheduleDate,jdbcType=TIMESTAMP},</if>
+        </set>
+    </sql>
+
+    <sql id="where">
+        <if test="null!=id">AND id = #{id,jdbcType=BIGINT},</if>
+        <if test="null!=yardId">AND yard_Id = #{yardId,jdbcType=INTEGER},</if>
+        <if test="null!=yardName">AND yard_Name = #{yardName,jdbcType=VARCHAR},</if>
+        <if test="null!=device">AND device = #{device,jdbcType=VARCHAR},</if>
+        <if test="null!=cabinetNo">AND cabinet_No = #{cabinetNo,jdbcType=VARCHAR},</if>
+        <if test="null!=createBy">AND create_by = #{createBy,jdbcType=BIGINT},</if>
+        <if test="null!=createTime">AND create_time = #{createTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=updateBy">AND update_by = #{updateBy,jdbcType=BIGINT},</if>
+        <if test="null!=updateTime">AND update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=delFlag">AND del_flag = #{delFlag,jdbcType=BIT},</if>
+        <if test="null!=eventType">AND event_Type = #{eventType,jdbcType=INTEGER},</if>
+        <if test="null!=keyInfoId">AND key_info_id = #{keyInfoId,jdbcType=INTEGER},</if>
+        <if test="null!=scheduleDate">AND schedule_date = #{scheduleDate,jdbcType=TIMESTAMP},</if>
+    </sql>
+</mapper>
 \ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.scheduling.LinggangSchedulingMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.scheduling.LinggangScheduling">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="schedule_date" jdbcType="DATE" property="scheduleDate"/>
+        <result column="line_name" jdbcType="VARCHAR" property="lineName"/>
+        <result column="job_code" jdbcType="VARCHAR" property="jobCode"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="posts" jdbcType="VARCHAR" property="posts"/>
+        <result column="lp_name" jdbcType="VARCHAR" property="lpName"/>
+        <result column="nbbm" jdbcType="VARCHAR" property="nbbm"/>
+        <result column="bc_type" jdbcType="VARCHAR" property="bcType"/>
+        <result column="fcsj_t" jdbcType="BIGINT" property="fcsjT"/>
+        <result column="zdsj_t" jdbcType="BIGINT" property="zdsjT"/>
+        <result column="sign_in_id" jdbcType="INTEGER" property="signInId"/>
+        <result column="ex_type" jdbcType="TINYINT" property="exType"/>
+        <result column="sign_time" jdbcType="TIMESTAMP" property="signTime"/>
+        <result column="sign_type" jdbcType="TINYINT" property="signType"/>
+        <result column="alcohol_flag" jdbcType="TINYINT" property="alcoholFlag"/>
+        <result column="alcohol_intake" jdbcType="DECIMAL" property="alcoholIntake"/>
+        <result column="remark" jdbcType="VARCHAR" property="remark"/>
+        <result column="key_info_id" jdbcType="INTEGER" property="keyInfoId"/>
+    </resultMap>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ruoyi.domain.scheduling.LinggangScheduling">
+        INSERT INTO scheduling
+        <include refid="insertSelectiveColumn"></include>
+        <include refid="insertSelectiveValue"></include>
+    </insert>
+
+    <sql id="columns">
+        id
+        ,  schedule_date   ,  line_name   ,  job_code   ,  name   ,  posts   ,  lp_name   ,  nbbm   ,  bc_type   ,  fcsj_t   ,  zdsj_t   ,  sign_in_id   ,  ex_type   ,  sign_time   ,  sign_type   ,  alcohol_flag   ,  alcohol_intake   ,  remark   ,  key_info_id
+    </sql>
+
+    <sql id="insert_columns">
+        id
+        ,  schedule_date  ,  line_name  ,  job_code  ,  name  ,  posts  ,  lp_name  ,  nbbm  ,  bc_type  ,  fcsj_t  ,  zdsj_t  ,  sign_in_id  ,  ex_type  ,  sign_time  ,  sign_type  ,  alcohol_flag  ,  alcohol_intake  ,  remark  ,  key_info_id
+    </sql>
+
+    <sql id="insert_values">
+        #{id}
+        ,
+        #{scheduleDate},
+        #{lineName},
+        #{jobCode},
+        #{name},
+        #{posts},
+        #{lpName},
+        #{nbbm},
+        #{bcType},
+        #{fcsjT},
+        #{zdsjT},
+        #{signInId},
+        #{exType},
+        #{signTime},
+        #{signType},
+        #{alcoholFlag},
+        #{alcoholIntake},
+        #{remark},
+        #{keyInfoId}
+    </sql>
+
+    <sql id="insertSelectiveColumn">
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null!=id">id,</if>
+            <if test="null!=scheduleDate">schedule_date,</if>
+            <if test="null!=lineName">line_name,</if>
+            <if test="null!=jobCode">job_code,</if>
+            <if test="null!=name">name,</if>
+            <if test="null!=posts">posts,</if>
+            <if test="null!=lpName">lp_name,</if>
+            <if test="null!=nbbm">nbbm,</if>
+            <if test="null!=bcType">bc_type,</if>
+            <if test="null!=fcsjT">fcsj_t,</if>
+            <if test="null!=zdsjT">zdsj_t,</if>
+            <if test="null!=signInId">sign_in_id,</if>
+            <if test="null!=exType">ex_type,</if>
+            <if test="null!=signTime">sign_time,</if>
+            <if test="null!=signType">sign_type,</if>
+            <if test="null!=alcoholFlag">alcohol_flag,</if>
+            <if test="null!=alcoholIntake">alcohol_intake,</if>
+            <if test="null!=remark">remark,</if>
+            <if test="null!=keyInfoId">key_info_id,</if>
+        </trim>
+    </sql>
+
+    <sql id="insertSelectiveValue">
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null!=id">#{id,jdbcType=INTEGER},</if>
+            <if test="null!=scheduleDate">#{scheduleDate,jdbcType=DATE},</if>
+            <if test="null!=lineName">#{lineName,jdbcType=VARCHAR},</if>
+            <if test="null!=jobCode">#{jobCode,jdbcType=VARCHAR},</if>
+            <if test="null!=name">#{name,jdbcType=VARCHAR},</if>
+            <if test="null!=posts">#{posts,jdbcType=VARCHAR},</if>
+            <if test="null!=lpName">#{lpName,jdbcType=VARCHAR},</if>
+            <if test="null!=nbbm">#{nbbm,jdbcType=VARCHAR},</if>
+            <if test="null!=bcType">#{bcType,jdbcType=VARCHAR},</if>
+            <if test="null!=fcsjT">#{fcsjT,jdbcType=BIGINT},</if>
+            <if test="null!=zdsjT">#{zdsjT,jdbcType=BIGINT},</if>
+            <if test="null!=signInId">#{signInId,jdbcType=INTEGER},</if>
+            <if test="null!=exType">#{exType,jdbcType=TINYINT},</if>
+            <if test="null!=signTime">#{signTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=signType">#{signType,jdbcType=TINYINT},</if>
+            <if test="null!=alcoholFlag">#{alcoholFlag,jdbcType=TINYINT},</if>
+            <if test="null!=alcoholIntake">#{alcoholIntake,jdbcType=DECIMAL},</if>
+            <if test="null!=remark">#{remark,jdbcType=VARCHAR},</if>
+            <if test="null!=keyInfoId">#{keyInfoId,jdbcType=INTEGER},</if>
+        </trim>
+    </sql>
+
+    <sql id="updateByPrimaryKeySelectiveSql">
+        <set>
+            <if test="null!=id">id = #{id,jdbcType=INTEGER},</if>
+            <if test="null!=scheduleDate">schedule_date = #{scheduleDate,jdbcType=DATE},</if>
+            <if test="null!=lineName">line_name = #{lineName,jdbcType=VARCHAR},</if>
+            <if test="null!=jobCode">job_code = #{jobCode,jdbcType=VARCHAR},</if>
+            <if test="null!=name">name = #{name,jdbcType=VARCHAR},</if>
+            <if test="null!=posts">posts = #{posts,jdbcType=VARCHAR},</if>
+            <if test="null!=lpName">lp_name = #{lpName,jdbcType=VARCHAR},</if>
+            <if test="null!=nbbm">nbbm = #{nbbm,jdbcType=VARCHAR},</if>
+            <if test="null!=bcType">bc_type = #{bcType,jdbcType=VARCHAR},</if>
+            <if test="null!=fcsjT">fcsj_t = #{fcsjT,jdbcType=BIGINT},</if>
+            <if test="null!=zdsjT">zdsj_t = #{zdsjT,jdbcType=BIGINT},</if>
+            <if test="null!=signInId">sign_in_id = #{signInId,jdbcType=INTEGER},</if>
+            <if test="null!=exType">ex_type = #{exType,jdbcType=TINYINT},</if>
+            <if test="null!=signTime">sign_time = #{signTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=signType">sign_type = #{signType,jdbcType=TINYINT},</if>
+            <if test="null!=alcoholFlag">alcohol_flag = #{alcoholFlag,jdbcType=TINYINT},</if>
+            <if test="null!=alcoholIntake">alcohol_intake = #{alcoholIntake,jdbcType=DECIMAL},</if>
+            <if test="null!=remark">remark = #{remark,jdbcType=VARCHAR},</if>
+            <if test="null!=keyInfoId">key_info_id = #{keyInfoId,jdbcType=INTEGER},</if>
+        </set>
+    </sql>
+
+    <sql id="where">
+        <if test="null!=id">AND id = #{id,jdbcType=INTEGER},</if>
+        <if test="null!=scheduleDate">AND schedule_date = #{scheduleDate,jdbcType=DATE},</if>
+        <if test="null!=lineName">AND line_name = #{lineName,jdbcType=VARCHAR},</if>
+        <if test="null!=jobCode">AND job_code = #{jobCode,jdbcType=VARCHAR},</if>
+        <if test="null!=name">AND name = #{name,jdbcType=VARCHAR},</if>
+        <if test="null!=posts">AND posts = #{posts,jdbcType=VARCHAR},</if>
+        <if test="null!=lpName">AND lp_name = #{lpName,jdbcType=VARCHAR},</if>
+        <if test="null!=nbbm">AND nbbm = #{nbbm,jdbcType=VARCHAR},</if>
+        <if test="null!=bcType">AND bc_type = #{bcType,jdbcType=VARCHAR},</if>
+        <if test="null!=fcsjT">AND fcsj_t = #{fcsjT,jdbcType=BIGINT},</if>
+        <if test="null!=zdsjT">AND zdsj_t = #{zdsjT,jdbcType=BIGINT},</if>
+        <if test="null!=signInId">AND sign_in_id = #{signInId,jdbcType=INTEGER},</if>
+        <if test="null!=exType">AND ex_type = #{exType,jdbcType=TINYINT},</if>
+        <if test="null!=signTime">AND sign_time = #{signTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=signType">AND sign_type = #{signType,jdbcType=TINYINT},</if>
+        <if test="null!=alcoholFlag">AND alcohol_flag = #{alcoholFlag,jdbcType=TINYINT},</if>
+        <if test="null!=alcoholIntake">AND alcohol_intake = #{alcoholIntake,jdbcType=DECIMAL},</if>
+        <if test="null!=remark">AND remark = #{remark,jdbcType=VARCHAR},</if>
+        <if test="null!=keyInfoId">AND key_info_id = #{keyInfoId,jdbcType=INTEGER},</if>
+    </sql>
+</mapper>
 \ No newline at end of file
 package com.ruoyi.common.utils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
 import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
-    public static String YYYY = "yyyy";
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
+    public static FastDateFormat YYYY = FastDateFormat.getInstance("yyyy");
+
+    public static FastDateFormat YYYY_MM = FastDateFormat.getInstance("yyyy-MM");
-    public static String YYYY_MM = "yyyy-MM";
+    public static FastDateFormat YYYY_MM_DD = FastDateFormat.getInstance("yyyy-MM-dd");
-    public static String YYYY_MM_DD = "yyyy-MM-dd";
+    public static FastDateFormat YYYYMMDDHHMMSS = FastDateFormat.getInstance("yyyyMMddHHmmss");
-    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+    public static FastDateFormat YYYY_MM_DD_HH_MM_SS = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
+    public static FastDateFormat YYYY_MM_DD_HH_MM = FastDateFormat.getInstance("yyyy-MM-dd HH:mm");
+
+    public static FastDateFormat YYYY_MM_DD_SKIMMING = FastDateFormat.getInstance("yyyy/MM/dd");
+    public static FastDateFormat YYYY_MM_DD_HH_MM_SS_SKIMMING = FastDateFormat.getInstance("yyyy/MM/dd HH:mm:ss");
+    public static FastDateFormat YYYY_MM_DD_HH_MM_SKIMMING = FastDateFormat.getInstance("yyyy/MM/dd HH:mm");
+    public static FastDateFormat YYYY_MM_SKIMMING = FastDateFormat.getInstance("yyyy/MM");
+
+    public static FastDateFormat YYYY_MM_DD_SPOT = FastDateFormat.getInstance("yyyy.MM.dd");
+    public static FastDateFormat YYYY_MM_DD_HH_MM_SS_SPOT = FastDateFormat.getInstance("yyyy.MM.dd HH:mm:ss");
+    public static FastDateFormat YYYY_MM_DD_HH_MM_SPOT = FastDateFormat.getInstance("yyyy.MM.dd HH:mm");
+    public static FastDateFormat YYYY_MM_SPOT = FastDateFormat.getInstance("yyyy.MM");
-    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final FastDateFormat format) {
         return parseDateToStr(format, new Date());
     }
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
-    public static final String parseDateToStr(final String format, final Date date)
-    {
-        return new SimpleDateFormat(format).format(date);
+    public static final String parseDateToStr(final FastDateFormat format, final Date date) {
+        return format.format(date);
     }
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
-            return new SimpleDateFormat(format).parse(ts);
+    public static final String parseDateToStr(final String format, final Date date) {
+        if (StringUtils.equals(format, YYYY.getPattern())) {
+            return YYYY.format(date);
+        } else if (StringUtils.equals(format, YYYY_MM.getPattern())) {
+            return YYYY_MM.format(date);
+        } else if (StringUtils.equals(format, YYYY_MM_DD.getPattern())) {
+            return YYYY_MM_DD.format(date);
+        } else if (StringUtils.equals(format, YYYYMMDDHHMMSS.getPattern())) {
+            return YYYYMMDDHHMMSS.format(date);
+        } else {
+            return YYYY_MM_DD_HH_MM_SS.format(date);
         }
-        catch (ParseException e)
-        {
+    }
+
+    public static final Date dateTime(final String format, final String ts) {
+        try {
+            return new SimpleDateFormat(format).parse(ts);
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -94,8 +107,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -103,8 +115,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -112,18 +123,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
@@ -131,8 +137,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -140,20 +145,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算相差天数
      */
-    public static int differentDaysByMillisecond(Date date1, Date date2)
-    {
+    public static int differentDaysByMillisecond(Date date1, Date date2) {
         return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
     }
     /**
      * 计算时间差
      *
-     * @param endTime 最后时间
+     * @param endDate   最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
-    public static String timeDistance(Date endDate, Date startTime)
-    {
+    public static String timeDistance(Date endDate, Date startTime) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -174,8 +177,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDateTime ==> Date
      */
-    public static Date toDate(LocalDateTime temporalAccessor)
-    {
+    public static Date toDate(LocalDateTime temporalAccessor) {
         ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
@@ -183,8 +185,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
 package com.ruoyi.common.utils.poi;
-import com.alibaba.excel.EasyExcel;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.style.WriteCellStyle;
-import com.alibaba.excel.write.metadata.style.WriteFont;
-import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.RegExUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.poi.hssf.usermodel.HSSFClientAnchor;
-import org.apache.poi.hssf.usermodel.HSSFPicture;
-import org.apache.poi.hssf.usermodel.HSSFPictureData;
-import org.apache.poi.hssf.usermodel.HSSFShape;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ooxml.POIXMLDocumentPart;
-import org.apache.poi.ss.usermodel.BorderStyle;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.DataValidation;
-import org.apache.poi.ss.usermodel.DataValidationConstraint;
-import org.apache.poi.ss.usermodel.DataValidationHelper;
-import org.apache.poi.ss.usermodel.DateUtil;
-import org.apache.poi.ss.usermodel.Drawing;
-import org.apache.poi.ss.usermodel.FillPatternType;
-import org.apache.poi.ss.usermodel.Font;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.IndexedColors;
-import org.apache.poi.ss.usermodel.Name;
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.WorkbookFactory;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
-import org.apache.poi.xssf.usermodel.XSSFDrawing;
-import org.apache.poi.xssf.usermodel.XSSFPicture;
-import org.apache.poi.xssf.usermodel.XSSFShape;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.alibaba.excel.EasyExcel;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
@@ -89,6 +16,32 @@ import com.ruoyi.common.utils.file.FileTypeUtils;
 import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.ImageUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
+import org.apache.poi.hssf.usermodel.*;
+import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.*;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 /**
  * Excel相关处理
@@ -1691,6 +1644,8 @@ public class ExcelUtil&lt;T&gt;
         return str;
     }
+
+
     /**
      * 是否有对象的子列表
      */