蓝斯接口

liujun001
1 parent 00126f18
Showing 96 changed files with 3045 additions and 18 deletions
Bsth-admin/src/main/java/com/ruoyi/config/BsthSystemConfig.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/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/sign/in/resource/LinggangSignInResourceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/venue/info/LinggangVenueInfoController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/dto/DssDriveQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/dto/LoginDriverDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/vo/LoginDriverVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/FaceCheckDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/FaceRegisterDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/ResDataDriveDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/vo/FaceCheckVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/vo/DssDriveVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/car/info/dto/GetPlatesDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBeforeWorkListDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBusPlanListDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/vo/GetBeforeWorkListVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/vo/GetBusPlanListVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/EquipmentAuthDTO.java
@@ -13,4 +13,7 @@ import org.springframework.stereotype.Component;
 public class BsthSystemConfig {
     @Value("${bsth.upload.image.basePath}")
     private String imageBasePath;
+
+    @Value("${bsth.upload.video.basePath}")
+    private String videoBasePath;
 }
@@ -22,12 +22,16 @@ import com.ruoyi.domain.dss.driver.vo.GetBusPlanListVo;
 import com.ruoyi.domain.dss.sign.dto.DssGetWineRecordDTO;
 import com.ruoyi.domain.dss.sign.dto.DssSignDTO;
 import com.ruoyi.domain.dss.sign.dto.DssSignOutDTO;
+import com.ruoyi.domain.dss.sign.resource.UpLoadPictureDTO;
+import com.ruoyi.domain.dss.sign.resource.UpLoadVideoDTO;
 import com.ruoyi.domain.dss.sign.vo.DssSignVo;
 import com.ruoyi.domain.dss.sign.vo.GetWineRecordVo;
 import com.ruoyi.domain.dss.sign.vo.SignOutVo;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
+import com.ruoyi.exception.InterruptException;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.service.ISignInService;
 import com.ruoyi.pojo.response.SignInResponseVo;
@@ -35,6 +39,7 @@ import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.FaceService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
 import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -74,6 +79,8 @@ public class DssDriverController extends BaseController {
     private CarInfoService carInfoService;
     @Autowired
     private IEquipmentService equipmentService;
+    @Autowired
+    private LinggangSignInResourceService signInResourceService;
  
     @PostMapping(value = "/Driver/Login")
     @ApiOperation("人员登录设备")
@@ -210,6 +217,38 @@ public class DssDriverController extends BaseController {
         return ResponseResult.success(vos);
     }
  
+    @PostMapping(value = "Driver/UpLoadPicture")
+    @ApiOperation(value = "25.酒测照片上传")
+    public ResponseResult<Boolean> UpLoadPicture(@Valid @RequestBody UpLoadPictureDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<LinggangSignInResource> convertLinggangSignInResources = convertLinggangSignInResource(dto);
+        try {
+            boolean flag = signInResourceService.insertImage(convertLinggangSignInResources);
+            return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("上传失败，请稍后再试");
+        } catch (InterruptException e) {
+            log.error("图片上传失败,[{}]", dto);
+            return ResponseResult.error("上传失败，请稍后再试");
+        }
+    }
+
+    @PostMapping(value = "/Driver/UpLoadVideo")
+    @ApiOperation(value = "26.酒测视频上传")
+    public ResponseResult<Boolean> UpLoadVideo(@Valid @RequestBody UpLoadVideoDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangSignInResource resource = cconvertLinggangSignInResource(dto);
+        try {
+            boolean flag = signInResourceService.insertVoide(resource);
+            return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("上传失败，请稍后再试");
+        } catch (InterruptException e) {
+            log.error("视频上传失败,[{}]", dto);
+            return ResponseResult.error("上传失败，请稍后再试");
+        }
+    }
+
  
     /***
      * 登陆转换
@@ -381,6 +420,38 @@ public class DssDriverController extends BaseController {
         return signIn;
     }
  
+    private List<LinggangSignInResource> convertLinggangSignInResource(UpLoadPictureDTO dto) {
+        if (CollectionUtils.isEmpty(dto.getPicData())) {
+            return Collections.emptyList();
+        }
+
+        return dto.getPicData().stream().map(pic -> {
+            LinggangSignInResource resource = new LinggangSignInResource();
+            resource.setSignId(dto.getTestId());
+            resource.setIndex(pic.getIndex());
+            resource.setResourceType(1);
+            resource.setTime(pic.getTime());
+            resource.setCreateBy(getUserId());
+            resource.setCreateTime(new Date());
+            resource.setDevice(dto.getDevice());
+            resource.setContent(pic.getPic());
+
+            return resource;
+        }).collect(Collectors.toList());
+    }
+
+    private LinggangSignInResource cconvertLinggangSignInResource(UpLoadVideoDTO dto) {
+        LinggangSignInResource resource = new LinggangSignInResource();
+        resource.setSignId(dto.getTestId());
+        resource.setTime(dto.getTime());
+        resource.setIndex(1);
+        resource.setResourceType(2);
+        resource.setDevice(dto.getDevice());
+        resource.setContent(dto.getVideo());
+
+        return resource;
+    }
+
     private DssSignVo convertSignInVo(SignInResponseVo responseVo) {
         DssSignVo vo = new DssSignVo();
         vo.setTestId(Convert.toStr(responseVo.getId()));
@@ -79,7 +79,7 @@ public class DssEquipmentController extends BaseController {
  
     @ApiOperation("设备获取访问令牌")
     @GetMapping("/Auth")
-    public ResponseResult auth(@Valid @RequestBody EquipmentAuthDTO dto, BindingResult bindingResult) {
+    public ResponseResult<AuthVo> auth(@Valid @RequestBody EquipmentAuthDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -123,7 +123,7 @@ public class DssEquipmentController extends BaseController {
     @GetMapping(value = "/getConfig")
     @ApiOperation("设备获取远程参数配置")
     @Parameter(name = "device", description = "设备号", required = true)
-    public ResponseResult getConfig(@RequestParam(value = "device") String device) {
+    public ResponseResult<EquipmentConfigVo> getConfig(@RequestParam(value = "device") String device) {
         if (StringUtils.isEmpty(device)) {
             return ResponseResult.error("设备号不能为空");
         }
@@ -2,16 +2,20 @@ package com.ruoyi.controller.dss;
  
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.OrderEntity;
 import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.dss.key.box.dto.KeyBasicSyncDTO;
 import com.ruoyi.domain.dss.key.box.dto.SkipOperationDTO;
 import com.ruoyi.domain.dss.key.box.dto.TakeKeyDTO;
+import com.ruoyi.domain.dss.key.box.dto.YarnCabinetStatePageDTO;
 import com.ruoyi.domain.dss.key.box.vo.*;
 import com.ruoyi.domain.dss.key.location.dto.WorkPlateV2DTO;
 import com.ruoyi.domain.dss.key.location.vo.WorkPlateV2Vo;
@@ -30,10 +34,11 @@ 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 com.ruoyi.service.venue.info.LinggangVenueInfoService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 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.PostMapping;
@@ -73,6 +78,8 @@ public class KeyBoxController extends BaseController {
     private IEquipmentService equipmentService;
     @Autowired
     private NewDriverService newDriverService;
+    @Autowired
+    private LinggangVenueInfoService venueInfoService;
  
     @PostMapping(value = "/keybox/findKey")
     @ApiOperation("钥匙信息查询")
@@ -195,7 +202,7 @@ public class KeyBoxController extends BaseController {
     }
  
     @PostMapping(value = "Driver/TakeKey")
-    @ApiModelProperty(value = "20.人员领取钥匙")
+    @ApiOperation(value = "20.人员领取钥匙")
     public ResponseResult<TakeKeyVo> takeKey(@Valid TakeKeyDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
@@ -211,8 +218,8 @@ public class KeyBoxController extends BaseController {
     }
  
     @PostMapping(value = "Driver/TurnKey")
-    @ApiModelProperty(value = "21.人员归还钥匙")
-    public ResponseResult<TakeKeyVo> turnKey(@Valid TakeKeyDTO dto, BindingResult bindingResult) {
+    @ApiOperation(value = "21.人员归还钥匙")
+    public ResponseResult<TakeKeyVo> turnKey(@Valid @RequestBody TakeKeyDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
@@ -226,6 +233,84 @@ public class KeyBoxController extends BaseController {
         return new ResponseResult<>(responseResult.getCode(), responseResult.getMsg(), vo);
     }
  
+    @PostMapping(value = "/keybox/yarnCabinetState/page")
+    @ApiOperation(value = "24.场站钥匙柜实况信息")
+    public ResponseResult<YarnCabinetStatePageVO> yarnCabinetStatePage(@Valid @RequestBody YarnCabinetStatePageDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        Set<Integer> keyInfoIds = null;
+        List<KeyInfo> keyInfos = null;
+        LinggangKeyWorkLocation keyWorkLocation = new LinggangKeyWorkLocation();
+        if (StringUtils.isNotEmpty(dto.getDevice())) {
+            keyWorkLocation.setDevice(dto.getDevice());
+        }
+
+        if (StringUtils.isNotEmpty(dto.getPlate())) {
+            KeyInfo keyInfo = new KeyInfo();
+            keyInfo.setPlateNum(dto.getPlate());
+            keyInfos = keyInfoService.list(keyInfo);
+            if (CollectionUtils.isNotEmpty(keyInfos)) {
+                keyInfoIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
+            }
+        }
+
+        LinggangKeyWorkLocation location = new LinggangKeyWorkLocation();
+        location.setDevice(dto.getDevice());
+
+        List<LinggangKeyWorkLocation> locations = linggangKeyWorkLocationService.listRecent(location, keyInfoIds, new Date());
+        if (CollectionUtils.isEmpty(locations)) {
+            return ResponseResult.success();
+        }
+
+        location.setType(255);
+        location.setScheduleDate(locations.get(0).getScheduleDate());
+        int errorCount = linggangKeyWorkLocationService.countId(location);
+
+        location.setType(0);
+        int depositCount = linggangKeyWorkLocationService.countId(location);
+
+        Equipment equipment = queryEquipment(dto.getDevice());
+
+        Equipment sourceEq = new Equipment();
+        sourceEq.setYardId(locations.get(0).getYardId());
+        List<Equipment> equipmentList = equipmentService.list(sourceEq);
+
+        LinggangKeyWorkLocation locationEq = new LinggangKeyWorkLocation();
+        locationEq.setYardId(sourceEq.getYardId());
+        locationEq.setScheduleDate(locations.get(0).getScheduleDate());
+
+        List<LinggangKeyWorkLocation> locationsOfEq = linggangKeyWorkLocationService.list(locationEq);
+
+        locationEq = new LinggangKeyWorkLocation();
+        locationEq.setYardId(sourceEq.getYardId());
+        locationEq.setEndScheduleDate(locations.get(0).getScheduleDate());
+        IPage<LinggangKeyWorkLocation> page = linggangKeyWorkLocationService.pageList(new Page<>(dto.getPageNum(), dto.getPageSize()), locationEq, new OrderEntity());
+
+        List<LinggangScheduling> schedulings = Collections.emptyList();
+        List<CarInfo> carInfos = Collections.emptyList();
+        List<NewDriver> drivers = Collections.emptyList();
+        List<Equipment> yarnCabinetStateEqus = Collections.emptyList();
+
+        if (Objects.nonNull(page) && CollectionUtils.isNotEmpty(page.getRecords())) {
+            Set<Long> driverIds = page.getRecords().stream().map(LinggangKeyWorkLocation::getCreateBy).collect(Collectors.toSet());
+            drivers = newDriverService.listOfIdsLon(driverIds);
+
+            Set<String> deviceCodes = page.getRecords().stream().map(LinggangKeyWorkLocation::getDevice).collect(Collectors.toSet());
+            yarnCabinetStateEqus = equipmentService.listNameAndIDBydeviceIds(deviceCodes);
+
+            Set<Long> schedulingIds = page.getRecords().stream().map(LinggangKeyWorkLocation::getSchedulingId).collect(Collectors.toSet());
+            schedulings = schedulingService.listByIds(schedulingIds);
+            if (CollectionUtils.isNotEmpty(schedulings)) {
+                Set<String> nbbm = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
+                carInfos = carInfoService.list(nbbm);
+            }
+        }
+        YarnCabinetStatePageVO pageVO = conertYarnCabinetStatePageVO(locations, equipment, errorCount, depositCount, equipmentList, locationsOfEq, page, schedulings, dto, carInfos, drivers, yarnCabinetStateEqus);
+        return ResponseResult.success(pageVO);
+    }
+
     /***
      * 查询排班
      * @author liujun
@@ -435,4 +520,108 @@ public class KeyBoxController extends BaseController {
         vo.setResult(result.isSuccess() ? 0 : 1);
         return vo;
     }
+
+    private YarnCabinetStatePageVO conertYarnCabinetStatePageVO(List<LinggangKeyWorkLocation> locations, Equipment equipment,
+                                                                int errorCount, int depositCount, List<Equipment> equipmentList,
+                                                                List<LinggangKeyWorkLocation> locationsOfEqs,
+                                                                IPage<LinggangKeyWorkLocation> page, List<LinggangScheduling> schedulings,
+                                                                YarnCabinetStatePageDTO dto, List<CarInfo> carInfos, List<NewDriver> drivers,
+                                                                List<Equipment> yarnCabinetStateEqus) {
+        if (CollectionUtils.isEmpty(locations)) {
+            return null;
+        }
+        YarnCabinetStatePageVO vo = new YarnCabinetStatePageVO();
+        vo.setYarnId(locations.get(0).getYardId());
+        vo.setYarnName(locations.get(0).getYardName());
+        vo.setEx(errorCount);
+        vo.setIn(depositCount);
+
+        if (Objects.nonNull(equipment)) {
+            int count = Objects.isNull(equipment.getLatticeNumber()) ? 0 : equipment.getLatticeNumber() - errorCount - depositCount;
+            count = count < 0 ? 0 : count;
+            vo.setFree(count);
+        }
+
+
+        if (CollectionUtils.isNotEmpty(equipmentList)) {
+            List<YarnCabinetStatePageCabinetsVO> cabinets = equipmentList.stream().map(eq -> {
+                YarnCabinetStatePageCabinetsVO cabinetsVO = new YarnCabinetStatePageCabinetsVO();
+                cabinetsVO.setDeviceId(eq.getDeviceId());
+                cabinetsVO.setDevice(eq.getIp());
+                cabinetsVO.setDeviceName(eq.getName());
+
+                int count = Objects.isNull(eq.getLatticeNumber()) ? 0 : eq.getLatticeNumber();
+                List<YarnCabinetStatePageCabinetsKeysVO> keys = new ArrayList<>(count);
+                for (int i = 0; i < count; i++) {
+                    YarnCabinetStatePageCabinetsKeysVO keysVO = new YarnCabinetStatePageCabinetsKeysVO();
+                    keysVO.setCabinetNo(Convert.toStr(i + 1));
+                    if (CollectionUtils.isEmpty(locationsOfEqs)) {
+                        keysVO.setState(2);
+                    } else {
+                        Optional<LinggangKeyWorkLocation> optional = locationsOfEqs.stream().filter(l -> Objects.equals(l.getDevice(), eq.getDeviceId()) &&
+                                Objects.equals(keysVO.getCabinetNo(), l.getCabinetNo())).findFirst();
+                        if (optional.isPresent()) {
+                            if (Objects.equals(255, optional.get().getType())) {
+                                keysVO.setState(255);
+                            } else if (Objects.equals(0, optional.get().getType())) {
+                                keysVO.setState(1);
+                            } else {
+                                keysVO.setState(2);
+                            }
+
+                        }
+                    }
+                }
+
+                cabinetsVO.setKeys(keys);
+                return cabinetsVO;
+
+            }).collect(Collectors.toList());
+            vo.setCabinets(cabinets);
+        }
+
+        if (Objects.nonNull(page)) {
+            YarnCabinetStatePageOutKeysVo keysVo = new YarnCabinetStatePageOutKeysVo();
+            keysVo.setCurrent(dto.getPageNum());
+            keysVo.setSize(dto.getPageSize());
+            keysVo.setTotal(page.getTotal());
+            keysVo.setPages(Convert.toInt(page.getPages()));
+            if (CollectionUtils.isNotEmpty(page.getRecords())) {
+                List<YarnCabinetStatePageOutKeysRecordsVo> recordsVos = page.getRecords().stream().map(l -> {
+                    YarnCabinetStatePageOutKeysRecordsVo recordsVo = new YarnCabinetStatePageOutKeysRecordsVo();
+                    if (CollectionUtils.isNotEmpty(schedulings)) {
+                        Optional<LinggangScheduling> optional = schedulings.stream().filter(sc -> Objects.equals(l.getSchedulingId(), sc.getId())).findFirst();
+                        if (optional.isPresent()) {
+                            recordsVo.setRouteName(optional.get().getLineName());
+                            if (CollectionUtils.isNotEmpty(carInfos)) {
+                                Optional<CarInfo> optCar = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), optional.get().getNbbm())).findFirst();
+                                if (optCar.isPresent()) {
+                                    recordsVo.setPlate(optCar.get().getPlateNum());
+                                }
+                            }
+                        }
+                    }
+
+                    if (CollectionUtils.isNotEmpty(drivers)) {
+                        Optional<NewDriver> opt = drivers.stream().filter(d -> Objects.equals(Convert.toLong(d.getId()), l.getCreateBy())).findFirst();
+                        if (opt.isPresent()) {
+                            recordsVo.setStaffName(opt.get().getPersonnelName());
+                        }
+                    }
+                    recordsVo.setTime(l.getCreateTime());
+
+                    if (CollectionUtils.isNotEmpty(yarnCabinetStateEqus)) {
+                        Optional<Equipment> opt = yarnCabinetStateEqus.stream().filter(ya -> Objects.equals(ya.getDeviceId(), l.getDevice())).findFirst();
+                        if (opt.isPresent()) {
+                            recordsVo.setDeviceName(opt.get().getName());
+                        }
+                    }
+                    return recordsVo;
+                }).collect(Collectors.toList());
+                keysVo.setRecords(recordsVos);
+            }
+            vo.setOutKeys(keysVo);
+        }
+        return vo;
+    }
 }
+package com.ruoyi.controller.sign.in.resource;
+
+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.sign.in.resource.LinggangSignInResource;
+import com.ruoyi.domain.sign.in.resource.dto.LinggangSignInResourceAddDTO;
+import com.ruoyi.domain.sign.in.resource.dto.LinggangSignInResourceQueryDTO;
+import com.ruoyi.domain.sign.in.resource.dto.LinggangSignInResourceUpdateDTO;
+import com.ruoyi.domain.sign.in.resource.vo.LinggangSignInResourceVO;
+import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
+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/sign/in/resource")
+public class LinggangSignInResourceController extends BaseController {
+    @Autowired
+    private LinggangSignInResourceService linggangSignInResourceService;
+
+    @ApiOperation("分页查询")
+    @PreAuthorize("@ss.hasPermi('linggang:sign:in:resource:list:limit:page:limit')")
+    @PostMapping(value = "/list/limit/{page}/{pageLimit}")
+    public IPage<LinggangSignInResourceVO> listLimit(@ModelAttribute LinggangSignInResourceQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+        LinggangSignInResource entity = convert(request);
+        IPage<LinggangSignInResource> response = linggangSignInResourceService.pageList(new Page<LinggangSignInResource>(page, pageLimit), entity, orderEntity);
+
+        return convert(response);
+    }
+
+    @ApiOperation("根据ID查询详情")
+    @GetMapping(value = "/view/{id}")
+    public com.ruoyi.common.core.domain.ResponseResult<LinggangSignInResourceVO> view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
+        LinggangSignInResource source = linggangSignInResourceService.getById(id);
+
+        return com.ruoyi.common.core.domain.ResponseResult.success(convert(source));
+    }
+
+
+    @PreAuthorize("@ss.hasPermi('linggang:sign:in:resource:export')")
+    @ApiOperation("导出")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody LinggangSignInResourceQueryDTO request) {
+        LinggangSignInResource entity = convert(request);
+        List<LinggangSignInResource> list = linggangSignInResourceService.list(entity);
+        ExcelUtil<LinggangSignInResource> util = new ExcelUtil<LinggangSignInResource>(LinggangSignInResource.class);
+        util.exportExcel(response, list, "LinggangSignInResource");
+    }
+
+    @ApiOperation("添加")
+    @PreAuthorize("@ss.hasPermi('linggang:sign:in:resource:add')")
+    @PostMapping(value = "/add")
+    public com.ruoyi.common.core.domain.ResponseResult add(@Valid @ModelAttribute LinggangSignInResourceAddDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangSignInResource entity = convert(request);
+        entity.setCreateBy(getUserId());
+        entity.setCreateTime(new Date());
+        int count = linggangSignInResourceService.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:sign:in:resource:update')")
+    @PostMapping(value = "/update")
+    public com.ruoyi.common.core.domain.ResponseResult update(@Valid @ModelAttribute LinggangSignInResourceUpdateDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangSignInResource entity = convert(request);
+        entity.setUpdateBy(getUserId());
+        entity.setUpdateTime(new Date());
+        boolean flag = linggangSignInResourceService.updateByPrimaryKey(entity);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
+    }
+
+    @PreAuthorize("@ss.hasPermi('linggang:sign:in:resource:del')")
+    @ApiOperation("删除数据")
+    @GetMapping(value = "/del/{id}")
+    public com.ruoyi.common.core.domain.ResponseResult delById(@PathVariable("id") Long id) {
+        boolean flag = linggangSignInResourceService.deleteById(id);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("操作数据失败，请稍后再试");
+    }
+
+    private LinggangSignInResource convert(LinggangSignInResourceQueryDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangSignInResource target = new LinggangSignInResource();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangSignInResource convert(LinggangSignInResourceUpdateDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangSignInResource target = new LinggangSignInResource();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+
+    private LinggangSignInResource convert(LinggangSignInResourceAddDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangSignInResource target = new LinggangSignInResource();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private LinggangSignInResourceVO convert(LinggangSignInResource source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangSignInResourceVO target = new LinggangSignInResourceVO();
+            BeanUtils.copyProperties(source, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private List<LinggangSignInResourceVO> convert(List<LinggangSignInResource> 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<LinggangSignInResourceVO> convert(IPage<LinggangSignInResource> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            IPage<LinggangSignInResourceVO> target = new Page();
+            BeanUtils.copyProperties(scs, target);
+            List<LinggangSignInResourceVO> voNames = convert(scs.getRecords());
+            target.setRecords(voNames);
+
+            return target;
+        }).orElseGet(null);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.controller.venue.info;
+
+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.venue.info.LinggangVenueInfo;
+import com.ruoyi.domain.venue.info.dto.LinggangVenueInfoAddDTO;
+import com.ruoyi.domain.venue.info.dto.LinggangVenueInfoQueryDTO;
+import com.ruoyi.domain.venue.info.dto.LinggangVenueInfoUpdateDTO;
+import com.ruoyi.domain.venue.info.dto.LinggangVenueInfoUpdateStatusDTO;
+import com.ruoyi.domain.venue.info.vo.LinggangVenueInfoVO;
+import com.ruoyi.service.venue.info.LinggangVenueInfoService;
+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 = "场地Info")
+@RequestMapping("linggang/venue/info")
+public class LinggangVenueInfoController extends BaseController {
+    @Autowired
+    private LinggangVenueInfoService linggangVenueInfoService;
+
+    @ApiOperation("分页查询")
+    @PreAuthorize("@ss.hasPermi('linggang:venue:info:list:limit:page:limit')")
+    @PostMapping(value = "/list/limit/{page}/{pageLimit}")
+    public IPage<LinggangVenueInfoVO> listLimit(@ModelAttribute LinggangVenueInfoQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+        LinggangVenueInfo entity = convert(request);
+        IPage<LinggangVenueInfo> response = linggangVenueInfoService.pageList(new Page<LinggangVenueInfo>(page, pageLimit), entity, orderEntity);
+
+        return convert(response);
+    }
+
+    @ApiOperation("根据ID查询详情")
+    @GetMapping(value = "/view/{id}")
+    public com.ruoyi.common.core.domain.ResponseResult<LinggangVenueInfoVO> view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
+        LinggangVenueInfo source = linggangVenueInfoService.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<LinggangVenueInfoVO>> listSelect(@RequestBody LinggangVenueInfoQueryDTO request) {
+        LinggangVenueInfo entity = convert(request);
+        List<LinggangVenueInfo> selectList = linggangVenueInfoService.listOfSelect(entity);
+        return com.ruoyi.common.core.domain.ResponseResult.success(convert(selectList));
+    }
+
+    @PreAuthorize("@ss.hasPermi('linggang:venue:info:export')")
+    @ApiOperation("导出")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody LinggangVenueInfoQueryDTO request) {
+        LinggangVenueInfo entity = convert(request);
+        List<LinggangVenueInfo> list = linggangVenueInfoService.list(entity);
+        ExcelUtil<LinggangVenueInfo> util = new ExcelUtil<LinggangVenueInfo>(LinggangVenueInfo.class);
+        util.exportExcel(response, list, "LinggangVenueInfo");
+    }
+
+    @ApiOperation("添加")
+    @PreAuthorize("@ss.hasPermi('linggang:venue:info:add')")
+    @PostMapping(value = "/add")
+    public com.ruoyi.common.core.domain.ResponseResult add(@Valid @ModelAttribute LinggangVenueInfoAddDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangVenueInfo entity = convert(request);
+        entity.setCreateBy(getUserId());
+        entity.setCrateTime(new Date());
+        int count = linggangVenueInfoService.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:venue:info:update')")
+    @PostMapping(value = "/update")
+    public com.ruoyi.common.core.domain.ResponseResult update(@Valid @ModelAttribute LinggangVenueInfoUpdateDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangVenueInfo entity = convert(request);
+        entity.setUpdateBy(getUserId());
+        entity.setUpdateTime(new Date());
+        boolean flag = linggangVenueInfoService.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:venue:info:update:status')")
+    @PostMapping(value = "/update/status")
+    public com.ruoyi.common.core.domain.ResponseResult updateState(@ModelAttribute LinggangVenueInfoUpdateStatusDTO request) {
+        LinggangVenueInfo entity = convert(request);
+        boolean flag = linggangVenueInfoService.updateByPrimaryKey(entity);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
+    }
+
+    private LinggangVenueInfo convert(LinggangVenueInfoQueryDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangVenueInfo target = new LinggangVenueInfo();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangVenueInfo convert(LinggangVenueInfoUpdateDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangVenueInfo target = new LinggangVenueInfo();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangVenueInfo convert(LinggangVenueInfoUpdateStatusDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangVenueInfo target = new LinggangVenueInfo();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangVenueInfo convert(LinggangVenueInfoAddDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangVenueInfo target = new LinggangVenueInfo();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private LinggangVenueInfoVO convert(LinggangVenueInfo source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangVenueInfoVO target = new LinggangVenueInfoVO();
+            BeanUtils.copyProperties(source, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private List<LinggangVenueInfoVO> convert(List<LinggangVenueInfo> 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<LinggangVenueInfoVO> convert(IPage<LinggangVenueInfo> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            IPage<LinggangVenueInfoVO> target = new Page();
+            BeanUtils.copyProperties(scs, target);
+            List<LinggangVenueInfoVO> voNames = convert(scs.getRecords());
+            target.setRecords(voNames);
+
+            return target;
+        }).orElseGet(null);
+    }
+}
 \ No newline at end of file
 package com.ruoyi.domain.driver.dss.syn.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,4 +24,9 @@ public class DssDriveQueryDTO implements java.io.Serializable {
     private String deviceId;
     @ApiModelProperty(value = "终端人脸数据版本  null终端无记录")
     private String versionNo;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.driver.dss.syn.login.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -37,5 +38,10 @@ public class LoginDriverDTO implements java.io.Serializable {
     @ApiModelProperty(value = "登录校验时间:yyyy-MM-dd HH:mm:ss")
     private Date authTime;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
  
 }
 package com.ruoyi.domain.driver.dss.syn.login.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,4 +62,9 @@ public class LoginDriverVo {
     @ApiModelProperty(value = "员工物理卡号")
     private String csn;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
 package com.ruoyi.domain.driver.dss.syn.res.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,4 +40,9 @@ public class FaceCheckDTO implements java.io.Serializable {
     @NotEmpty(message = "人脸图片数据不能为空")
     @ApiModelProperty(value = "人脸图片数据图片数据格式为BASE64", required = true)
     private String faceValue;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.driver.dss.syn.res.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,4 +39,9 @@ public class FaceRegisterDTO implements java.io.Serializable {
     @NotNull(message = "人脸图片数据 不能为空")
     @ApiModelProperty(value = "人脸图片数据", required = true)
     private String faceValue;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.driver.dss.syn.res.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -66,4 +67,9 @@ public class ResDataDriveDTO implements java.io.Serializable {
  
     @ApiModelProperty(value = "角色类型列表")
     private Set<Integer> staffTypeItem;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.driver.dss.syn.res.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -23,4 +24,9 @@ public class FaceCheckVo implements java.io.Serializable {
     private String driverCode;
     @ApiModelProperty(value = "表情  0无情绪，1愤怒，2厌恶，3恐惧，4高兴，5伤心，6惊讶")
     private Integer emotion;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.driver.dss.syn.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,4 +43,9 @@ public class DssDriveVo {
     private String csn;
     @ApiModelProperty("角色类型  1:员工  2:驾驶员 3管理员 4移车员")
     private Set<Integer> staffTypeItem;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.car.info.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,4 +29,8 @@ public class GetPlatesDTO implements java.io.Serializable {
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.driver.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,4 +39,9 @@ public class GetBeforeWorkListDTO implements java.io.Serializable {
     private String driver;
     @ApiModelProperty(value = "岗前检测结果 0通过，1不通过")
     private Integer checkResult;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.driver.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -39,4 +40,9 @@ public class GetBusPlanListDTO implements java.io.Serializable{
     @NotEmpty(message = "每页条数为空")
     @ApiModelProperty(value = "每页条数",required = true,example = "1")
     private Integer    pageRow;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.driver.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -60,4 +61,9 @@ public class GetBeforeWorkListVo {
     private String oxygenValue;
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.driver.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -44,4 +45,9 @@ public class GetBusPlanListVo implements java.io.Serializable {
     private Date fache;
     @ApiModelProperty(value = "起点站名")
     private String startStation;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,4 +24,9 @@ public class EquipmentAuthDTO {
     private String device;
     @ApiModelProperty(value = "获取token设备时间", required = true)
     private Date authTime;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,4 +28,9 @@ public class EquipmentSelfcheckCamerasDto implements java.io.Serializable {
     @NotNull(message = "摄像头状态不能为空")
     @ApiModelProperty(value = "状态 0正常，1故障，2未检测到", required = true, example = "1")
     private Integer status;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
@@ -62,5 +63,10 @@ public class EquipmentSelfcheckDto implements java.io.Serializable {
     @ApiModelProperty(value = "是否拥有钥匙柜外设:null/0:否，1:是", example = "1")
     private Integer isKeybox;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
  
 }
 package com.ruoyi.domain.dss.equipment.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,4 +30,9 @@ public class ExKeysDTO implements java.io.Serializable {
     private String parkCode;
     @ApiModelProperty(value = "车牌")
     private String plate;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,4 +41,10 @@ public class HeartbeatDTO implements java.io.Serializable {
     private List<ExKeysDTO> exKeys;
  
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+
 }
 package com.ruoyi.domain.dss.equipment.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -21,4 +22,9 @@ import lombok.experimental.Accessors;
 public class AuthVo {
     @JsonProperty("access_token")
     private String accessToken;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -23,4 +24,9 @@ public class EquimentAddressParamVo {
     private String upgradeAddress;
     @ApiModelProperty(value = "端口", example = "1")
     private Integer integer;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -29,4 +30,9 @@ public class EquimentVideoParamVo {
     private Integer saveday;
     @ApiModelProperty(value = "上传时间段", example = "1")
     private String videoTimeSlot;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.equipment.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -33,4 +34,9 @@ public class EquipmentConfigVo implements java.io.Serializable {
     private EquimentVideoParamVo videoParam;
     @ApiModelProperty(value = "升级设置")
     private EquimentAddressParamVo addressParam;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,4 +46,9 @@ public class KeyBasicSyncDTO {
     @ApiModelProperty(value = "多日期排班计划列表版本号 null或与服务器版本号不同时 服务器则下发数据")
     private String driverWorkVer;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
 package com.ruoyi.domain.dss.key.box.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -43,4 +44,9 @@ public class SkipOperationDTO implements java.io.Serializable {
     @NotNull(message = "操作类型 不能为空")
     @ApiModelProperty(value = "操作类型 0:司机操作，16:管理员操作，17:紧急按键", required = true)
     private Integer opeType;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,4 +51,9 @@ public class TakeKeyDTO implements java.io.Serializable {
     private String checkPlate;
     @ApiModelProperty(value = "领取钥匙信息集合")
     private List<TakeKeyKeyItemDTO> keyItem;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -45,4 +46,9 @@ public class TakeKeyKeyItemDTO implements java.io.Serializable {
     @ApiModelProperty(value = "领取状态;0:取出，16:钥匙未归还，255:异常", required = true)
     private Integer state;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
+package com.ruoyi.domain.dss.key.box.dto;
+
+import com.alibaba.fastjson2.JSON;
+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月25日 9:08
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "24.场站钥匙柜实况信息")
+@EqualsAndHashCode(callSuper = false)
+public class YarnCabinetStatePageDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -888568497451412073L;
+
+    @NotEmpty(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+    @ApiModelProperty(value = "车牌号")
+    private String plate;
+
+    @NotEmpty(message = "每页条数不能为空")
+    @ApiModelProperty(value = "钥匙领取记录，每页条数", required = true, example = "1")
+    private Integer pageSize;
+
+    @NotEmpty(message = "第几页不能为空")
+    @ApiModelProperty(value = "钥匙领取记录，第几页", required = true, example = "1")
+    private Integer pageNum;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -28,4 +29,9 @@ public class BasicSyncDriverWorkDriverPlanTimePlateVo implements java.io.Seriali
  
     @ApiModelProperty(value = "车牌号")
     private String value;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -26,4 +27,11 @@ public class BasicSyncDriverWorkDriverPlanVo implements java.io.Serializable {
     private String staffCode;
     @ApiModelProperty(value = "司机的计划时间与车牌")
     private BasicSyncDriverWorkDriverPlanTimePlateVo timePlate;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
+
+
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -31,4 +32,9 @@ public class BasicSyncDriverWorkVo implements java.io.Serializable {
  
     @ApiModelProperty(value = "排班计划列表")
     private List<BasicSyncDriverWorkDriverPlanVo> driverPlan;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -23,4 +24,9 @@ public class BasicSyncKeyboxKeyItemVo {
  
     @ApiModelProperty(value = "绑定的场站车位编码")
     private String parkCode;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -29,4 +30,9 @@ public class BasicSyncKeyboxVo {
  
     @ApiModelProperty(value = "钥匙位信息列表")
     private List<BasicSyncKeyboxKeyItemVo> keyItem;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -54,4 +55,9 @@ public class BasicSyncVo implements java.io.Serializable {
  
     @ApiModelProperty(value = "多日期排班计划列表")
     private List<BasicSyncDriverWorkVo> driverWork;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -27,4 +28,9 @@ public class BasicSyncYardVo implements java.io.Serializable{
     @ApiModelProperty(value = "邻近的车位编号列表 用来紧急取出某车位附件车位的所有钥匙")
     private List<String> conIndex;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -38,4 +39,9 @@ public class SkipOperationVo implements java.io.Serializable {
     @ApiModelProperty(value = "处理结果  0成功，1失败")
     private Integer result;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
 package com.ruoyi.domain.dss.key.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -39,4 +40,9 @@ public class TakeKeyVo implements java.io.Serializable {
     @ApiModelProperty(value = "服务应答 0处理成功，1处理失败")
     private Integer result;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
+package com.ruoyi.domain.dss.key.box.vo;
+
+import com.alibaba.fastjson2.JSON;
+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月25日 9:19
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "场站钥匙柜实况信息-场站钥匙柜列表-钥匙控制器状态列表 VO")
+public class YarnCabinetStatePageCabinetsKeysVO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -7131162155935875283L;
+    @ApiModelProperty(value = "钥匙控制器号")
+    private String cabinetNo;
+    @ApiModelProperty(value = "")
+    private String parkingNo;
+    @ApiModelProperty(value = "车位号")
+    private String plateNum;
+    @ApiModelProperty(value = "状态 1存在钥匙，2空闲， 255异常")
+    private Integer state;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
+package com.ruoyi.domain.dss.key.box.vo;
+
+import com.alibaba.fastjson2.JSON;
+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.List;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 9:18
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "场站钥匙柜实况信息-场站钥匙柜列表 VO")
+public class YarnCabinetStatePageCabinetsVO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -8511700348167941326L;
+
+    @ApiModelProperty(value = "钥匙柜ID")
+    private String deviceId;
+    @ApiModelProperty(value = "上线号")
+    private String device;
+    @ApiModelProperty(value = "钥匙柜名称")
+    private String deviceName;
+    @ApiModelProperty(value = "钥匙控制器状态列表")
+    private List<YarnCabinetStatePageCabinetsKeysVO> keys;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
+package com.ruoyi.domain.dss.key.box.vo;
+
+import com.alibaba.fastjson2.JSON;
+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月25日 9:32
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "场站钥匙柜实况信息-钥匙领取记录分页-钥匙最新领取记录列表 VO")
+public class YarnCabinetStatePageOutKeysRecordsVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = -7846056516852561924L;
+
+    @ApiModelProperty(value = "线路名称")
+    private String routeName;
+
+    @ApiModelProperty(value = "车牌号")
+    private String plate;
+
+    @ApiModelProperty(value = "车辆自编号")
+    private String selfCode;
+
+    @ApiModelProperty(value = "领取人")
+    private String staffName;
+
+    @JsonFormat(pattern = "yyyy-MM-dd hh:mmss")
+    @ApiModelProperty(value = "领取时间")
+    private Date time;
+
+    @ApiModelProperty(value = "设备名称")
+    private String deviceName;
+
+    @ApiModelProperty(value = "车位号")
+    private String parkingNo;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
+package com.ruoyi.domain.dss.key.box.vo;
+
+import com.alibaba.fastjson2.JSON;
+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.List;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 9:31
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "场站钥匙柜实况信息-钥匙领取记录分页 VO")
+public class YarnCabinetStatePageOutKeysVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = -1926894568917850390L;
+
+    @ApiModelProperty(value = "总记录数")
+    private Long total;
+
+    @ApiModelProperty(value = "每页记录数")
+    private Integer size;
+
+    @ApiModelProperty(value = "总页数")
+    private Integer pages;
+
+    @ApiModelProperty(value = "当前页码")
+    private Integer current;
+
+    @ApiModelProperty(value = "钥匙最新领取记录列表")
+    private List<YarnCabinetStatePageOutKeysRecordsVo> records;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
+package com.ruoyi.domain.dss.key.box.vo;
+
+import com.alibaba.fastjson2.JSON;
+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.List;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 9:15
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "场站钥匙柜实况信息 VO")
+public class YarnCabinetStatePageVO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -1325787785491106232L;
+
+    @ApiModelProperty(value = "场站ID")
+    private Integer yarnId;
+    @ApiModelProperty(value = "场站名称")
+    private String yarnName;
+    @ApiModelProperty(value = "异常钥匙孔数", example = "1")
+    private Integer ex;
+    @ApiModelProperty(value = "插入钥匙数")
+    private Integer in;
+    @ApiModelProperty(value = "空闲的控制器数")
+    private Integer free;
+    @ApiModelProperty(value = "场站钥匙柜列表")
+    private List<YarnCabinetStatePageCabinetsVO> cabinets;
+    @ApiModelProperty(value = "钥匙领取记录分页")
+    private YarnCabinetStatePageOutKeysVo outKeys;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
 package com.ruoyi.domain.dss.key.location.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,4 +41,9 @@ public class WorkPlateV2DTO {
     @NotNull(message = "操作类型不能为空")
     @ApiModelProperty(value = "操作类型:0签到获取司机工作计划的钥匙，1签退获取司机最后一次领取的钥匙信息", required = true)
     private Integer eventType;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.key.location.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -33,4 +34,9 @@ public class WorkPlateV2Vo implements java.io.Serializable {
     private String parkingNo;
     @ApiModelProperty(value = "车牌号")
     private String plateNum;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,4 +28,9 @@ public class DssGetWineRecordDTO implements java.io.Serializable {
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
 package com.ruoyi.domain.dss.sign.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -61,4 +62,9 @@ public class DssSignDTO {
  
     @ApiModelProperty(value = "答题记录")
     private DssSignQuestionRecordDTO questionRecord;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,4 +27,9 @@ public class DssSignHealthDataDTO {
     @ApiModelProperty(value = "心率值")
     private BigDecimal heartRate;
  
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
 }
 package com.ruoyi.domain.dss.sign.dto;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,4 +35,9 @@ public class DssSignOutDTO implements java.io.Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "设备时间,yyyy-MM-dd HH:mm:ss")
     private Date logoutTime;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,4 +34,9 @@ public class DssSignQuestionAnswerDTO {
     private String questionType;
     @ApiModelProperty("调查记录ID")
     private String recordId;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -41,4 +42,9 @@ public class DssSignQuestionRecordDTO {
     private String userName;
     @ApiModelProperty(value = "问卷答案集合")
     private List<DssSignQuestionAnswerDTO> questionAnswerList;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
+package com.ruoyi.domain.dss.sign.resource;
+
+import com.alibaba.fastjson2.JSON;
+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;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 13:59
+ */
+@Data
+@ApiModel(value = "酒测照片上传DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class UpLoadPictureDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = 693316864098417788L;
+
+    @NotEmpty(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+    @NotEmpty(message = "IC卡号不能为空")
+    @ApiModelProperty(value = "IC卡号", required = true)
+    private String driverCode;
+
+    @NotNull(message = "上传时间不能为空")
+    @ApiModelProperty(value = "时间；格式:yyyy-MM-dd HH:mm:ss", required = true)
+    private Date time;
+
+    @NotNull(message = "酒测Id不能为空")
+    @ApiModelProperty(value = "酒测Id", required = true)
+    private Long testId;
+
+    @NotNull(message = "照片数据列表不能为空")
+    @ApiModelProperty(value = "照片数据列表", required = true)
+    private List<UpLoadPicturePicDataDTO> picData;
+
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
+package com.ruoyi.domain.dss.sign.resource;
+
+import com.alibaba.fastjson2.JSON;
+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.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 14:00
+ */
+@Data
+@ApiModel(value = "酒测照片上传-照片数据列表DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class UpLoadPicturePicDataDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = 1260486082339136995L;
+
+    @NotNull(message = "照片序号不能为空")
+    @ApiModelProperty(value = "照片序号", required = true)
+    private Integer index;
+
+    @NotNull(message = "时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "时间;格式为yyyy-MM-dd HH:mm:ss", required = true)
+    private Date time;
+
+    @NotEmpty(message = "照片内容不能为空")
+    @ApiModelProperty(value = "照片;格式：BASE64", required = true)
+    private String pic;
+
+    @Override
+    public String toString() {
+        String content = this.getPic();
+        this.setPic(null);
+        String json = JSON.toJSONString(this);
+        this.setPic(content);
+
+        return json;
+    }
+}
+package com.ruoyi.domain.dss.sign.resource;
+
+import com.alibaba.fastjson2.JSON;
+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;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 15:37
+ */
+@Data
+@ApiModel(value = "酒测视频上传")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class UpLoadVideoDTO implements java.io.Serializable {
+
+
+    private static final long serialVersionUID = 6032175603030905274L;
+
+    @NotEmpty(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+    @NotEmpty(message = "卡号不能为空")
+    @ApiModelProperty(value = "卡号", required = true)
+    private String driverCode;
+
+    @NotNull(message = "时间不能为空")
+    @ApiModelProperty(value = "时间;格式为：yyyy-MM-dd HH:mm:ss", required = true)
+    private Date time;
+
+    @NotNull(message = "酒测Id不能为空")
+    @ApiModelProperty(value = "酒测Id", required = true)
+    private Long testId;
+
+    @NotEmpty(message = "视频数据不能为空")
+    @ApiModelProperty(value = "视频数据;格式：BASE64", required = true)
+    private String video;
+
+    @Override
+    public String toString() {
+        String content = this.getVideo();
+        this.setVideo(null);
+        String json = JSON.toJSONString(this);
+        this.setVideo(content);
+
+        return json;
+    }
+}
 package com.ruoyi.domain.dss.sign.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -28,4 +29,9 @@ public class DssSignHealthDataVo implements java.io.Serializable {
     private Integer oxygenValue;
     @ApiModelProperty(value = "心率 0:正常 1:低 2:高")
     private Integer heartRate;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -32,4 +33,9 @@ public class DssSignVo implements java.io.Serializable {
  
     @ApiModelProperty(value = "健康检测结果")
     private DssSignHealthDataVo healthData;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.vo;
  
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -29,4 +30,9 @@ public class GetWineRecordVo implements java.io.Serializable {
  
     @ApiModelProperty(value = "是否重新检测")
     private Boolean check;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.dss.sign.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -26,4 +27,9 @@ public class SignOutVo {
  
     @ApiModelProperty(value = "设备时间,yyyy-MM-dd HH:mm:ss")
     private Date logoutTime;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.key.info.box.dto;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -42,4 +43,9 @@ public class KeyBoxQueryDTO implements java.io.Serializable {
     @NotNull(message = " 类型 不能为空")
     @ApiModelProperty(value = "类型：0签到上报获取，1签退归还获取", required = true)
     private String eventType;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
 package com.ruoyi.domain.key.info.box.vo;
  
+import com.alibaba.fastjson2.JSON;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -31,4 +32,9 @@ public class KeyBoxVo implements java.io.Serializable {
     private String parkingNo;
     @ApiModelProperty(value = "车牌号")
     private String plateNum;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
  
 import java.util.Arrays;
+import java.util.Date;
 import java.util.Objects;
 import java.util.Optional;
  
@@ -103,6 +104,14 @@ public class LinggangKeyWorkLocation {
     @Excel(name = "状态：1 是归还；0是借出")
     private java.lang.Integer type;
  
+    @TableField(exist = false)
+    private Long scheduleDateTimeDiff;
+
+    @TableField(exist = false)
+    private Date startScheduleDate;
+    @TableField(exist = false)
+    private Date endScheduleDate;
+
  
     public enum LinggangKeyWorkLocationEventTypeEnum {
         TAKE_OUT(0, "取出"),
+package com.ruoyi.domain.sign.in.resource;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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("Sign_in_Resource")
+/**打卡上传资源 实体*/
+public class LinggangSignInResource {
+    /***ID*/
+    @TableId(value = "id", type = IdType.AUTO)
+    @Excel(name = "ID")
+    private Long id;
+
+
+    /***打卡ID*/
+    @Excel(name = "打卡ID")
+    private Long signId;
+
+
+    /***顺序*/
+    @Excel(name = "顺序")
+    private Integer index;
+
+
+    /***资源类型：1是图片；2是视频*/
+    @Excel(name = "资源类型：1是图片；2是视频")
+    private Integer resourceType;
+
+
+    /***时间*/
+    @Excel(name = "时间")
+    private java.util.Date time;
+
+
+    /***创建人员*/
+    @Excel(name = "创建人员")
+    private Long createBy;
+
+
+    /***创建时间*/
+    @Excel(name = "创建时间")
+    private java.util.Date createTime;
+
+
+    /***修改人员*/
+    @Excel(name = "修改人员")
+    private Long updateBy;
+
+
+    /***修改时间*/
+    @Excel(name = "修改时间")
+    private java.util.Date updateTime;
+
+    /***路径*/
+    @Excel(name = "路径")
+    private java.lang.String path;
+
+    @TableField(exist = false)
+    private String device;
+    /**文件内容*/
+    @TableField(exist = false)
+    private String content;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.sign.in.resource.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 LinggangSignInResourceAddDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 537778184L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***打卡ID*/
+    @ApiModelProperty(value = "打卡ID", example = "1")
+    private Long signId;
+    /***顺序*/
+    @ApiModelProperty(value = "顺序", example = "1")
+    private Integer index;
+    /***资源类型：1是图片；2是视频*/
+    @ApiModelProperty(value = "资源类型：1是图片；2是视频", example = "1")
+    private Integer resourceType;
+    /***时间*/
+    @ApiModelProperty(value = "时间")
+    private java.util.Date time;
+    /***创建人员*/
+    @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;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+    /***路径*/
+    @ApiModelProperty(value = "路径")
+    private java.lang.String path;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.sign.in.resource.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 LinggangSignInResourceQueryDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 367815784L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***打卡ID*/
+    @ApiModelProperty(value = "打卡ID", example = "1")
+    private Long signId;
+    /***顺序*/
+    @ApiModelProperty(value = "顺序", example = "1")
+    private Integer index;
+    /***资源类型：1是图片；2是视频*/
+    @ApiModelProperty(value = "资源类型：1是图片；2是视频", example = "1")
+    private Integer resourceType;
+    /***时间*/
+    @ApiModelProperty(value = "时间")
+    private java.util.Date time;
+    /***创建人员*/
+    @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;
+
+    /***路径*/
+    @ApiModelProperty(value = "路径")
+    private java.lang.String path;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.sign.in.resource.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 LinggangSignInResourceUpdateDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 258398919L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***打卡ID*/
+    @ApiModelProperty(value = "打卡ID", example = "1")
+    private Long signId;
+    /***顺序*/
+    @ApiModelProperty(value = "顺序", example = "1")
+    private Integer index;
+    /***资源类型：1是图片；2是视频*/
+    @ApiModelProperty(value = "资源类型：1是图片；2是视频", example = "1")
+    private Integer resourceType;
+    /***时间*/
+    @ApiModelProperty(value = "时间")
+    private java.util.Date time;
+    /***创建人员*/
+    @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;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+    /***路径*/
+    @ApiModelProperty(value = "路径")
+    private java.lang.String path;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.sign.in.resource.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 LinggangSignInResourceVO implements java.io.Serializable {
+    private static final long serialVersionUID = 876699789L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Long id;
+    /***打卡ID*/
+    @ApiModelProperty(value = "打卡ID", example = "1")
+    private Long signId;
+    /***顺序*/
+    @ApiModelProperty(value = "顺序", example = "1")
+    private Integer index;
+    /***资源类型：1是图片；2是视频*/
+    @ApiModelProperty(value = "资源类型：1是图片；2是视频", example = "1")
+    private Integer resourceType;
+    /***时间*/
+    @ApiModelProperty(value = "时间")
+    private java.util.Date time;
+    /***创建人员*/
+    @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;
+
+    /***路径*/
+    @ApiModelProperty(value = "路径")
+    private java.lang.String path;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.venue.info;
+
+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("venue_info")
+/**场地Info 实体*/
+public class LinggangVenueInfo {
+    /****/
+    @TableId(value = "ID", type = IdType.AUTO)
+    @Excel(name = "")
+    private Integer id;
+
+
+    /***场站编号*/
+    @Excel(name = "场站编号")
+    private String parkCode;
+
+
+    /***地址*/
+    @Excel(name = "地址")
+    private String parkAddr;
+
+
+    /***是否删除；0为不删除；1为删除*/
+    @Excel(name = "是否删除；0为不删除；1为删除")
+    private Boolean delFlag;
+
+
+    /***创建人员*/
+    @Excel(name = "创建人员")
+    private Long createBy;
+
+
+    /***创建时间*/
+    @Excel(name = "创建时间")
+    private java.util.Date crateTime;
+
+
+    /***修改人员*/
+    @Excel(name = "修改人员")
+    private Long updateBy;
+
+
+    /***修改时间*/
+    @Excel(name = "修改时间")
+    private java.util.Date updateTime;
+
+
+    /***场站名称*/
+    @Excel(name = "场站名称")
+    private String name;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.venue.info.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "场地Info的添加DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**场地Info DTO*/
+public class LinggangVenueInfoAddDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 240224244L;
+
+    /****/
+    @ApiModelProperty(value = "", example = "1")
+    private Integer id;
+    /***场站编号*/
+    @ApiModelProperty(value = "场站编号")
+    private String parkCode;
+    /***地址*/
+    @ApiModelProperty(value = "地址")
+    private String parkAddr;
+    /***是否删除；0为不删除；1为删除*/
+    @ApiModelProperty(value = "是否删除；0为不删除；1为删除")
+    private Boolean delFlag;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date crateTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String name;
+    /***操作人员*/
+    @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.venue.info.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "场地Info的查询DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**场地Info DTO*/
+public class LinggangVenueInfoQueryDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 742428594L;
+
+    /****/
+    @ApiModelProperty(value = "", example = "1")
+    private Integer id;
+    /***场站编号*/
+    @ApiModelProperty(value = "场站编号")
+    private String parkCode;
+    /***地址*/
+    @ApiModelProperty(value = "地址")
+    private String parkAddr;
+    /***是否删除；0为不删除；1为删除*/
+    @ApiModelProperty(value = "是否删除；0为不删除；1为删除")
+    private Boolean delFlag;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date crateTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String name;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.venue.info.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "场地Info的修改DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**场地Info DTO*/
+public class LinggangVenueInfoUpdateDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 144439709L;
+
+    /****/
+    @ApiModelProperty(value = "", example = "1")
+    private Integer id;
+    /***场站编号*/
+    @ApiModelProperty(value = "场站编号")
+    private String parkCode;
+    /***地址*/
+    @ApiModelProperty(value = "地址")
+    private String parkAddr;
+    /***是否删除；0为不删除；1为删除*/
+    @ApiModelProperty(value = "是否删除；0为不删除；1为删除")
+    private Boolean delFlag;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date crateTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String name;
+    /***操作人员*/
+    @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.venue.info.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "场地Info的修改状态DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**场地Info DTO*/ public class LinggangVenueInfoUpdateStatusDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 907489383L;
+
+    /****/
+    @ApiModelProperty(value = "", example = "1")
+    private Integer id;
+    /***场站编号*/
+    @ApiModelProperty(value = "场站编号")
+    private String parkCode;
+    /***地址*/
+    @ApiModelProperty(value = "地址")
+    private String parkAddr;
+    /***是否删除；0为不删除；1为删除*/
+    @ApiModelProperty(value = "是否删除；0为不删除；1为删除")
+    private Boolean delFlag;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date crateTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String name;
+    /***操作人员*/
+    @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.venue.info.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 = "场地Info的VO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**场地Info VO*/
+public class LinggangVenueInfoVO implements java.io.Serializable {
+    private static final long serialVersionUID = 251922541L;
+
+    /****/
+    @ApiModelProperty(value = "", example = "1")
+    private Integer id;
+    /***场站编号*/
+    @ApiModelProperty(value = "场站编号")
+    private String parkCode;
+    /***地址*/
+    @ApiModelProperty(value = "地址")
+    private String parkAddr;
+    /***是否删除；0为不删除；1为删除*/
+    @ApiModelProperty(value = "是否删除；0为不删除；1为删除")
+    private Boolean delFlag;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员")
+    private Long createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date crateTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员")
+    private Long updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***场站名称*/
+    @ApiModelProperty(value = "场站名称")
+    private String name;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
 package com.ruoyi.equipment.domain;
  
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
  
 import java.util.Date;
  
@@ -88,6 +84,15 @@ public class Equipment extends BaseEntity {
     @Excel(name = "格子数")
     private java.lang.Integer latticeNumber;
  
+    /***钥匙柜名称*/
+    @Excel(name = "钥匙柜名称")
+    private java.lang.String name;
+
+
+    /***场站ID*/
+    @Excel(name = "场站ID")
+    private java.lang.Integer yardId;
+
  
  
 }
@@ -50,6 +50,8 @@ public interface IEquipmentService extends IService&lt;Equipment&gt; {
      */
     List<Equipment> listOfSelect(Equipment equipment);
  
+    List<Equipment> list(Equipment equipment);
+
     /***
      *根据设备ID查询设备名称和ID
      * @author liujun
@@ -67,11 +67,16 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
  
     @Override
     public List<Equipment> listOfSelect(Equipment equipment) {
-
         return equipmentMapper.queryIdsiteNameBypromise(equipment.getPromise());
     }
  
     @Override
+    public List<Equipment> list(Equipment equipment) {
+        LambdaQueryWrapper<Equipment> wrapper = new LambdaQueryWrapper<>(equipment);
+        return list(wrapper);
+    }
+
+    @Override
     public List<Equipment> listNameAndIDByIds(Collection<Integer> ids) {
         if (CollectionUtils.isEmpty(ids)) {
             return Collections.emptyList();
+package com.ruoyi.exception;
+
+import lombok.Data;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 15:22
+ */
+@Data
+public class InterruptException extends RuntimeException {
+    private String code;
+    private String message;
+
+    public InterruptException(String message) {
+        super(message);
+        this.message = message;
+    }
+}
@@ -99,5 +99,9 @@ public class SignIn extends BaseEntity {
     /***排班信息ID*/
     @Excel(name = "排班信息ID")
     private java.lang.Long schedulingId;
+
+    /***资源类型：1图片；2视频*/
+    @Excel(name = "资源类型：1图片；2视频")
+    private java.lang.Integer resourceType;
 }
  
+package com.ruoyi.mapper.sign.in.resource;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+/**打卡上传资源 Mapper接口*/
+public interface LinggangSignInResourceMapper extends BaseMapper<LinggangSignInResource> {
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangSignInResource name);
+}
 \ No newline at end of file
+package com.ruoyi.mapper.venue.info;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.venue.info.LinggangVenueInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+/**场地Info Mapper接口*/
+public interface LinggangVenueInfoMapper extends BaseMapper<LinggangVenueInfo> {
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangVenueInfo name);
+}
 \ No newline at end of file
@@ -34,6 +34,10 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
  
     List<NewDriver> listOfIds(java.util.Collection<java.lang.String> ids);
  
+    List<NewDriver> listOfIdsInt(java.util.Collection<java.lang.Integer> ids);
+
+    List<NewDriver> listOfIdsLon(java.util.Collection<java.lang.Long> ids);
+
     /***
      *用于页面选择
      */
@@ -107,6 +107,26 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     }
  
     @Override
+    public List<NewDriver> listOfIdsInt(Collection<Integer> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(NewDriver::getId, ids);
+        return list(wrapper);
+    }
+
+    @Override
+    public List<NewDriver> listOfIdsLon(Collection<Long> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(NewDriver::getId, ids);
+        return list(wrapper);
+    }
+
+    @Override
     public List<NewDriver> listOfSelect(NewDriver entity) {
         LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(NewDriver::getId, NewDriver::getJobCode, NewDriver::getPersonnelName);
@@ -17,6 +17,7 @@ import com.ruoyi.service.key.info.KeyInfoService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,12 +47,14 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public IPage<LinggangKeyWorkLocation> pageList(Page<LinggangKeyWorkLocation> page, LinggangKeyWorkLocation entity, OrderEntity orderEntity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(LinggangKeyWorkLocation::getId);
+        switchTime(entity, countWrapper);
         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);
+            switchTime(entity, selectWrapper);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -66,10 +69,65 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return returnPage;
     }
  
+    private static  void switchTime( LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if(Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())){
+            wrapper.between(LinggangKeyWorkLocation::getScheduleDate, entity.getStartScheduleDate(), entity.getEndScheduleDate());
+        }else if(Objects.nonNull(entity.getStartScheduleDate())){
+            wrapper.ge(LinggangKeyWorkLocation::getScheduleDate, entity.getStartScheduleDate());
+        }else if(Objects.nonNull(entity.getEndScheduleDate())){
+            wrapper.le(LinggangKeyWorkLocation::getScheduleDate, entity.getEndScheduleDate());
+        }
+    }
+
     @Override
     public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
         return list(new LambdaQueryWrapper<>(entity));
     }
+
+    @Override
+    public List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Date date) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        if (Objects.nonNull(date)) {
+            wrapper.lt(LinggangKeyWorkLocation::getScheduleDate, date);
+        }
+        return null;
+    }
+
+    @Override
+    public List<LinggangKeyWorkLocation> listRecent(Collection<Integer> keyIds, Date date) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>();
+        if (CollectionUtils.isNotEmpty(keyIds)) {
+            wrapper.in(LinggangKeyWorkLocation::getKeyInfoId, keyIds);
+        }
+        if (Objects.nonNull(date)) {
+            wrapper.lt(LinggangKeyWorkLocation::getScheduleDate, date);
+        }
+
+        List<LinggangKeyWorkLocation> locations = list(wrapper);
+        return chooseRecent(locations, date);
+    }
+
+    @Override
+    public List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Collection<Integer> keyIds, Date date) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        if (Objects.nonNull(date)) {
+            wrapper.lt(LinggangKeyWorkLocation::getScheduleDate, date);
+        }
+
+        if (CollectionUtils.isNotEmpty(keyIds)) {
+            wrapper.in(LinggangKeyWorkLocation::getKeyInfoId, keyIds);
+        }
+        List<LinggangKeyWorkLocation> locations = list(wrapper);
+        return chooseRecent(locations, date);
+    }
+
+    @Override
+    public List<LinggangKeyWorkLocation> listOfLtEqScheduleDate(LinggangKeyWorkLocation entity, Date scheduleDate) {
+        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.gt(LinggangKeyWorkLocation::getScheduleDate, scheduleDate);
+        return list(wrapper);
+    }
+
     // @Override
     // public List<LinggangKeyWorkLocation> listOfSelect(LinggangKeyWorkLocation entity) {
     //      LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
@@ -139,7 +197,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             return ResponseResult.success();
         }
  
-        ResponseResult<List<LinggangKeyWorkLocation>> responseResult = checkTaskKey(locations,typeEnum);
+        ResponseResult<List<LinggangKeyWorkLocation>> responseResult = checkTaskKey(locations, typeEnum);
         if (!responseResult.isSuccess()) {
             return ResponseResult.error(responseResult.getCode(), responseResult.getMsg());
         }
@@ -167,7 +225,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         if (StringUtils.isNotEmpty(msg)) {
             resultStr.append(msg);
             resultStr.append("；");
-            return StringUtils.isEmpty(msg)?ResponseResult.success(resultStr.toString()):ResponseResult.error(resultStr.toString());
+            return StringUtils.isEmpty(msg) ? ResponseResult.success(resultStr.toString()) : ResponseResult.error(resultStr.toString());
         }
  
  
@@ -176,7 +234,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
  
     public boolean update(LinggangKeyWorkLocation location) {
         LambdaUpdateWrapper<LinggangKeyWorkLocation> wrapper = new LambdaUpdateWrapper<>();
-        wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime,new Date());
+        wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime, new Date());
         wrapper.eq(LinggangKeyWorkLocation::getId, location.getId()).ne(LinggangKeyWorkLocation::getEventType, location.getEventType());
  
         return update(wrapper);
@@ -405,4 +463,37 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         });
         return builder.toString();
     }
+
+    private List<LinggangKeyWorkLocation> chooseRecent(List<LinggangKeyWorkLocation> locations, Date date) {
+        if (CollectionUtils.isEmpty(locations)) {
+            return Collections.emptyList();
+        }
+
+        Map<Integer, LinggangKeyWorkLocation> linggangKeyWorkLocationMap = locations.stream().map(l -> {
+                    Long value = null;
+                    if (Objects.isNull(l.getScheduleDate())) {
+                        value = -9999L;
+                    } else if (Objects.isNull(date)) {
+                        value = l.getScheduleDate().getTime();
+                    } else {
+                        value = date.getTime() - l.getScheduleDate().getTime();
+                    }
+                    l.setScheduleDateTimeDiff(value);
+
+                    return l;
+                }).filter(l -> Objects.nonNull(l.getScheduleDateTimeDiff()) && l.getScheduleDateTimeDiff() > 0)
+                .collect(Collectors.groupingBy(LinggangKeyWorkLocation::getKeyInfoId, Collectors.collectingAndThen(Collectors.reducing((l1, l2) ->
+                        l1.getScheduleDateTimeDiff() < l2.getScheduleDateTimeDiff() ? l1 : l2), Optional::get)));
+
+        if (MapUtils.isEmpty(linggangKeyWorkLocationMap)) {
+            return Collections.emptyList();
+        }
+
+        List<LinggangKeyWorkLocation> source = new ArrayList<>(linggangKeyWorkLocationMap.size());
+        linggangKeyWorkLocationMap.forEach((key, value) -> {
+            source.add(value);
+        });
+
+        return source;
+    }
 }
 \ No newline at end of file
+package com.ruoyi.service.impl.sign.in.resource;
+
+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.common.core.domain.ResponseResult;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
+import com.ruoyi.exception.InterruptException;
+import com.ruoyi.mapper.sign.in.resource.LinggangSignInResourceMapper;
+import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
+import com.ruoyi.utils.UploadUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+/**打卡上传资源 Service实现类*/
+public class LinggangSignInResourceServiceImpl extends ServiceImpl<LinggangSignInResourceMapper, LinggangSignInResource> implements LinggangSignInResourceService {
+    @Autowired
+    private LinggangSignInResourceMapper linggangSignInResourceMapper;
+    @Autowired
+    private UploadUtil uploadUtil;
+
+    /**
+     * 分页查询
+     */
+    @Override
+    public IPage<LinggangSignInResource> pageList(Page<LinggangSignInResource> page, LinggangSignInResource entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<LinggangSignInResource> countWrapper = new LambdaQueryWrapper<>(entity);
+        countWrapper.select(LinggangSignInResource::getId);
+        int count = count(countWrapper);
+
+        List<LinggangSignInResource> lists = Collections.emptyList();
+        if (count > 0) {
+            PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
+            LambdaQueryWrapper<LinggangSignInResource> selectWrapper = new LambdaQueryWrapper<>(entity);
+            orderColumn(selectWrapper, orderEntity);
+            lists = list(selectWrapper);
+        }
+
+        IPage<LinggangSignInResource> returnPage = new Page<LinggangSignInResource>();
+        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<LinggangSignInResource> list(LinggangSignInResource entity) {
+        return list(new LambdaQueryWrapper<>(entity));
+    }
+    // @Override
+    // public List<LinggangSignInResource> listOfSelect(LinggangSignInResource entity) {
+    //      LambdaQueryWrapper<LinggangSignInResource> wrapper = new LambdaQueryWrapper<>(entity);
+    //     wrapper.select(LinggangSignInResource::, LinggangSignInResource::);
+    //      return list(wrapper);
+    //  }
+
+    // @Override
+    // public List<LinggangSignInResource> listOfIds(java.util.Collection<java.lang.Long> ids) {
+    //     if (org.springframework.util.CollectionUtils.isEmpty(ids)) {
+    //         return java.util.Collections.emptyList();
+    //    }
+    //   LambdaQueryWrapper<LinggangSignInResource> wrapper = new LambdaQueryWrapper<>();
+    //   wrapper.select(LinggangSignInResource::getId,LinggangSignInResource::);
+    //   wrapper.in(LinggangSignInResource::getId, ids);
+    //   return list(wrapper);
+    // }
+
+    @Override
+    public LinggangSignInResource getOne(LinggangSignInResource entity) {
+        return getOne(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public Integer countId(LinggangSignInResource entity) {
+        LambdaQueryWrapper<LinggangSignInResource> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(LinggangSignInResource::getId);
+        return count(wrapper);
+    }
+
+
+    /**
+     * 插入有值的列
+     */
+    @Override
+    public int insertSelective(LinggangSignInResource entity) {
+        return linggangSignInResourceMapper.insertSelective(entity);
+    }
+
+    /**
+     * 插入数据
+     */
+    @Override
+    public boolean insert(LinggangSignInResource entity) {
+        return save(entity);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean insertImage(List<LinggangSignInResource> entities) {
+        if (CollectionUtils.isEmpty(entities)) {
+            return Boolean.TRUE;
+        }
+
+        entities = entities.stream().map(en -> {
+            StringBuilder builder = new StringBuilder();
+            builder.append("sign");
+            builder.append(File.separator);
+            builder.append("images");
+            builder.append(File.separator);
+            builder.append(en.getDevice());
+            builder.append(File.separator);
+            builder.append(en.getSignId());
+            builder.append(File.separator);
+            builder.append(UUID.randomUUID().toString().replace("-", ""));
+            builder.append(".jpg");
+
+            en.setPath(builder.toString());
+            en.setResourceType(1);
+
+            return en;
+        }).collect(Collectors.toList());
+
+        boolean flag = saveBatch(entities);
+        if (flag) {
+            entities.stream().forEach(en -> {
+                ResponseResult<Boolean> result = uploadUtil.uploadImageOfBase64(en.getContent(), en.getPath(), "jpg");
+                if (!result.isSuccess() && Objects.equals(result.getData(), Boolean.FALSE)) {
+                    throw new InterruptException("图片上传失败，请检查服务器");
+                }
+            });
+        }
+
+
+        return flag;
+    }
+
+    @Override
+    public boolean insertVoide(LinggangSignInResource entity) {
+        StringBuilder builder = new StringBuilder();
+        builder.append("sign");
+        builder.append(File.separator);
+        builder.append("video");
+        builder.append(File.separator);
+        builder.append(entity.getDevice());
+        builder.append(File.separator);
+        builder.append(entity.getSignId());
+        builder.append(File.separator);
+        builder.append(UUID.randomUUID().toString().replace("-", ""));
+        builder.append(".mp4");
+
+        boolean flag = save(entity);
+        if (flag) {
+            ResponseResult<Boolean> result = uploadUtil.uploadVideoOfBase64(entity.getContent(), entity.getPath());
+            if (!result.isSuccess() && Objects.equals(result.getData(), Boolean.FALSE)) {
+                throw new InterruptException("视频上传失败，请检查服务器");
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 根据主键修改数据
+     */
+    @Override
+    public boolean updateByPrimaryKey(LinggangSignInResource entity) {
+        return updateById(entity);
+    }
+
+    /***根据主键删除数据*/
+    @Override
+    public boolean deleteById(Long id) {
+        return removeById(id);
+    }
+
+
+    public static void orderColumn(LambdaQueryWrapper<LinggangSignInResource> 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(LinggangSignInResource::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signId")) {
+                wrapper.orderByAsc(LinggangSignInResource::getSignId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "index")) {
+                wrapper.orderByAsc(LinggangSignInResource::getIndex);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "resourceType")) {
+                wrapper.orderByAsc(LinggangSignInResource::getResourceType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "time")) {
+                wrapper.orderByAsc(LinggangSignInResource::getTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByAsc(LinggangSignInResource::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
+                wrapper.orderByAsc(LinggangSignInResource::getCreateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByAsc(LinggangSignInResource::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByAsc(LinggangSignInResource::getUpdateTime);
+            }
+        } else if (org.apache.commons.lang3.StringUtils.equals("descending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByDesc(LinggangSignInResource::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signId")) {
+                wrapper.orderByDesc(LinggangSignInResource::getSignId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "index")) {
+                wrapper.orderByDesc(LinggangSignInResource::getIndex);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "resourceType")) {
+                wrapper.orderByDesc(LinggangSignInResource::getResourceType);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "time")) {
+                wrapper.orderByDesc(LinggangSignInResource::getTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByDesc(LinggangSignInResource::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
+                wrapper.orderByDesc(LinggangSignInResource::getCreateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByDesc(LinggangSignInResource::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByDesc(LinggangSignInResource::getUpdateTime);
+            }
+        } else {
+            wrapper.orderByDesc(LinggangSignInResource::getId);
+        }
+    }
+}
 \ No newline at end of file
+package com.ruoyi.service.impl.venue.info;
+
+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.venue.info.LinggangVenueInfo;
+import com.ruoyi.mapper.venue.info.LinggangVenueInfoMapper;
+import com.ruoyi.service.venue.info.LinggangVenueInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Service
+/**场地Info Service实现类*/
+public class LinggangVenueInfoServiceImpl extends ServiceImpl<LinggangVenueInfoMapper, LinggangVenueInfo> implements LinggangVenueInfoService {
+    @Autowired
+    private LinggangVenueInfoMapper linggangVenueInfoMapper;
+
+    /**
+     * 分页查询
+     */
+    @Override
+    public IPage<LinggangVenueInfo> pageList(Page<LinggangVenueInfo> page, LinggangVenueInfo entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<LinggangVenueInfo> countWrapper = new LambdaQueryWrapper<>(entity);
+        countWrapper.select(LinggangVenueInfo::getId);
+        int count = count(countWrapper);
+
+        List<LinggangVenueInfo> lists = Collections.emptyList();
+        if (count > 0) {
+            PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
+            LambdaQueryWrapper<LinggangVenueInfo> selectWrapper = new LambdaQueryWrapper<>(entity);
+            orderColumn(selectWrapper, orderEntity);
+            lists = list(selectWrapper);
+        }
+
+        IPage<LinggangVenueInfo> returnPage = new Page<LinggangVenueInfo>();
+        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<LinggangVenueInfo> list(LinggangVenueInfo entity) {
+        return list(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public List<LinggangVenueInfo> listOfSelect(LinggangVenueInfo entity) {
+        LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(LinggangVenueInfo::getId, LinggangVenueInfo::getName);
+        return list(wrapper);
+    }
+
+    @Override
+    public List<LinggangVenueInfo> listOfIds(java.util.Collection<java.lang.Integer> ids) {
+        if (org.springframework.util.CollectionUtils.isEmpty(ids)) {
+            return java.util.Collections.emptyList();
+        }
+        LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.select(LinggangVenueInfo::getId, LinggangVenueInfo::getName);
+        wrapper.in(LinggangVenueInfo::getId, ids);
+        return list(wrapper);
+    }
+
+    @Override
+    public LinggangVenueInfo getOne(LinggangVenueInfo entity) {
+        return getOne(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public Integer countId(LinggangVenueInfo entity) {
+        LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(LinggangVenueInfo::getId);
+        return count(wrapper);
+    }
+
+
+    /**
+     * 插入有值的列
+     */
+    @Override
+    public int insertSelective(LinggangVenueInfo entity) {
+        return linggangVenueInfoMapper.insertSelective(entity);
+    }
+
+    /**
+     * 插入数据
+     */
+    @Override
+    public boolean insert(LinggangVenueInfo entity) {
+        return save(entity);
+    }
+
+    /**
+     * 根据主键修改数据
+     */
+    @Override
+    public boolean updateByPrimaryKey(LinggangVenueInfo entity) {
+        return updateById(entity);
+    }
+
+    /***根据主键删除数据*/
+    @Override
+    public boolean deleteById(Integer id) {
+        return removeById(id);
+    }
+
+
+    public static void orderColumn(LambdaQueryWrapper<LinggangVenueInfo> 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(LinggangVenueInfo::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkCode")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getParkCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkAddr")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getParkAddr);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "delFlag")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getDelFlag);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "crateTime")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getCrateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "name")) {
+                wrapper.orderByAsc(LinggangVenueInfo::getName);
+            }
+        } else if (org.apache.commons.lang3.StringUtils.equals("descending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkCode")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getParkCode);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkAddr")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getParkAddr);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "delFlag")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getDelFlag);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "crateTime")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getCrateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "name")) {
+                wrapper.orderByDesc(LinggangVenueInfo::getName);
+            }
+        } else {
+            wrapper.orderByDesc(LinggangVenueInfo::getId);
+        }
+    }
+}
 \ No newline at end of file
@@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
  
+import java.util.Collection;
+import java.util.Date;
 import java.util.List;
  
  
@@ -23,6 +25,17 @@ public interface LinggangKeyWorkLocationService extends IService&lt;LinggangKeyWork
      */
     List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity);
  
+    List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Date date);
+
+    List<LinggangKeyWorkLocation> listRecent(Collection<Integer> keyIds, Date date);
+
+    List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity,Collection<Integer> keyIds, Date date);
+
+    /**
+     * 带条件查询
+     */
+    List<LinggangKeyWorkLocation> listOfLtEqScheduleDate(LinggangKeyWorkLocation entity,Date scheduleDate);
+
     // List<LinggangKeyWorkLocation> listOfIds(java.util.Collection<java.lang.Long> ids);
     // /***
     // *用于页面选择
+package com.ruoyi.service.sign.in.resource;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
+
+import java.util.List;
+
+
+/**
+ * 打卡上传资源 Service接口
+ */
+public interface LinggangSignInResourceService extends IService<LinggangSignInResource> {
+    /**
+     * 分页查询
+     */
+    IPage<LinggangSignInResource> pageList(com.baomidou.mybatisplus.extension.plugins.pagination.Page<LinggangSignInResource> page, LinggangSignInResource entity, OrderEntity orderEntity);
+
+    /**
+     * 带条件查询
+     */
+    List<LinggangSignInResource> list(LinggangSignInResource entity);
+
+    // List<LinggangSignInResource> listOfIds(java.util.Collection<java.lang.Long> ids);
+    // /***
+    // *用于页面选择
+    // */
+    // List<LinggangSignInResource> listOfSelect(LinggangSignInResource entity);
+
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    LinggangSignInResource getOne(LinggangSignInResource entity);
+
+    Integer countId(LinggangSignInResource entity);
+
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangSignInResource entity);
+
+    /***插入数据*/
+    boolean insert(LinggangSignInResource entity);
+
+    boolean insertImage(List<LinggangSignInResource> entities);
+
+    boolean insertVoide(LinggangSignInResource entity);
+
+    /**
+     * 根据主键修改数据
+     */
+    boolean updateByPrimaryKey(LinggangSignInResource entity);
+
+    boolean deleteById(Long id);
+}
 \ No newline at end of file
+package com.ruoyi.service.venue.info;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.venue.info.LinggangVenueInfo;
+
+import java.util.List;
+
+/**
+ * 场地Info Service接口
+ */
+public interface LinggangVenueInfoService extends IService<LinggangVenueInfo> {
+    /**
+     * 分页查询
+     */
+    IPage<LinggangVenueInfo> pageList(com.baomidou.mybatisplus.extension.plugins.pagination.Page<LinggangVenueInfo> page, LinggangVenueInfo entity, OrderEntity orderEntity);
+
+    /**
+     * 带条件查询
+     */
+    List<LinggangVenueInfo> list(LinggangVenueInfo entity);
+
+    List<LinggangVenueInfo> listOfIds(java.util.Collection<java.lang.Integer> ids);
+
+    /***
+     *用于页面选择
+     */
+    List<LinggangVenueInfo> listOfSelect(LinggangVenueInfo entity);
+
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    LinggangVenueInfo getOne(LinggangVenueInfo entity);
+
+    Integer countId(LinggangVenueInfo entity);
+
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LinggangVenueInfo entity);
+
+    /***插入数据*/
+    boolean insert(LinggangVenueInfo entity);
+
+    /**
+     * 根据主键修改数据
+     */
+    boolean updateByPrimaryKey(LinggangVenueInfo entity);
+
+
+    boolean deleteById(Integer id);
+
+}
 \ No newline at end of file
+package com.ruoyi.utils;
+
+import cn.hutool.core.codec.Base64;
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.config.BsthSystemConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.Objects;
+
+/**
+ * @author liujun
+ * @date 2024年07月25日 14:13
+ */
+@Slf4j
+@Component
+public class UploadUtil {
+
+    @Autowired
+    private BsthSystemConfig bsthSystemConfig;
+
+    /**
+     * 上传图片接口
+     *
+     * @param content 图片内容
+     * @param path    图片路径（相对路径）
+     * @param type    图片类型
+     * @return com.ruoyi.common.core.domain.ResponseResult<java.lang.Boolean>
+     * @author liujun
+     * @date 2024/7/25 14:31
+     */
+    public ResponseResult<Boolean> uploadImageOfBase64(String content, String path, String type) {
+        if (StringUtils.isEmpty(content)) {
+            return ResponseResult.error("上传的图片内容为空");
+        }
+
+        ByteArrayInputStream inputStream = null;
+        BufferedImage bufferedImage = null;
+        try {
+            byte[] bytes = Base64.decode(content);
+            inputStream = new ByteArrayInputStream(bytes);
+            bufferedImage = ImageIO.read(inputStream);
+            if (bufferedImage.getWidth() < 0 || bufferedImage.getHeight() < 0) {
+                return ResponseResult.error("请上传正确的图片");
+            }
+
+            StringBuilder filePath = new StringBuilder();
+            filePath.append(bsthSystemConfig.getImageBasePath());
+            filePath.append(File.separator);
+            filePath.append(path);
+
+            File file = new File(filePath.toString());
+            if(!file.exists() || !file.isDirectory()){
+                FileUtils.forceMkdirParent(file);
+            }
+
+            ImageIO.write(bufferedImage, type, file);
+            bufferedImage.flush();
+
+            return ResponseResult.success(Boolean.TRUE);
+        } catch (Exception e) {
+            log.error("上传图片异常:[{}]", path, e);
+            return ResponseResult.error("上传图片异常");
+        } finally {
+            if (Objects.nonNull(inputStream)) {
+                IOUtils.closeQuietly(inputStream);
+            }
+        }
+    }
+
+    /**
+     * 上传视频文件
+     *
+     * @param content
+     * @param path
+     * @return com.ruoyi.common.core.domain.ResponseResult<java.lang.Boolean>
+     * @author liujun
+     * @date 2024/7/25 14:37
+     */
+    public ResponseResult<Boolean> uploadVideoOfBase64(String content, String path) {
+        if (StringUtils.isEmpty(content)) {
+            return ResponseResult.error("上传的视频内容为空");
+        }
+
+        FileOutputStream outputStream = null;
+        try {
+            byte[] bytes = Base64.decode(content);
+
+            StringBuilder filePath = new StringBuilder();
+            filePath.append(bsthSystemConfig.getImageBasePath());
+            filePath.append(File.separator);
+            filePath.append(path);
+
+            File file = new File(filePath.toString());
+            if(!file.exists() || !file.isDirectory()){
+                FileUtils.forceMkdirParent(file);
+            }
+            outputStream = new FileOutputStream(file);
+            outputStream.write(bytes, 0, bytes.length);
+            outputStream.flush();
+
+            return ResponseResult.success(Boolean.TRUE);
+        } catch (Exception e) {
+            log.error("上传视频异常:[{}]", path, e);
+            return ResponseResult.error("上传视频异常");
+        } finally {
+            if (Objects.nonNull(outputStream)) {
+                IOUtils.closeQuietly(outputStream);
+            }
+        }
+    }
+}
@@ -198,4 +198,6 @@ netty:
 bsth:
     upload:
         image:
+            basePath: D:/temp/temp/bsth/upload
+        vide:
             basePath: D:/temp/temp/bsth/upload
 \ No newline at end of file
@@ -21,6 +21,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="lastHeartRes"    column="last_heart_res"    />
         <result property="onlineClient"    column="online_client"    />
         <result column="lattice_number" jdbcType="INTEGER" property="latticeNumber" />
+        <result column="name" property="name" />
+        <result column="yard_Id"  property="yardId" />
     </resultMap>
  
     <sql id="selectEquipmentVo">
@@ -38,6 +40,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="image != null  and image != ''"> and image = #{image}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
             <if test="onlineClient != null  and onlineClient != ''"> and online_client = #{onlineClient}</if>
+            <if test="null!=name">#{name}</if>
+            <if test="null!=yardId">#{yardId}</if>
         </where>
         order by id desc
     </select>
@@ -98,6 +102,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="lastHeartRes != null">last_heart_res,</if>
             <if test="onlineClient != null">online_client,</if>
             <if test="null!=latticeNumber">lattice_number,</if>
+            <if test="null!=name">name,</if>
+            <if test="null!=yardId">yard_Id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="siteName != null and siteName != ''">#{siteName},</if>
@@ -115,6 +121,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="lastHeartRes != null">#{lastHeartRes},</if>
             <if test="onlineClient != null">#{online_client},</if>
             <if test="null!=latticeNumber">#{latticeNumber,jdbcType=INTEGER},</if>
+            <if test="null!=name">#{name},</if>
+            <if test="null!=yardId">#{yardId},</if>
          </trim>
     </insert>
     <insert id="insertEquipmentOffLineLog">
@@ -148,7 +156,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="remark != null">remark = #{remark},</if>
             <if test="lastHeartRes != null">last_heart_res = #{lastHeartRes},</if>
             <if test="onlineClient != null">online_client = #{onlineClient},</if>
-            <if test="null!=latticeNumber"> lattice_number = #{latticeNumber,jdbcType=INTEGER},</if>
+            <if test="null!=latticeNumber"> lattice_number = #{latticeNumber},</if>
+            <if test="null!=name"> name = #{name},</if>
+            <if test="null!=yardId"> yard_Id = #{yardId},</if>
         </trim>
         where 1 = 1
         <if test="id !=null">
@@ -180,7 +190,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="remark != null">remark = #{remark},</if>
             <if test="lastHeartRes != null">last_heart_res = #{lastHeartRes},</if>
             <if test="onlineClient != null">online_client = #{onlineClient},</if>
-            <if test="null!=latticeNumber"> lattice_number = #{latticeNumber,jdbcType=INTEGER},</if>
+            <if test="null!=latticeNumber"> lattice_number = #{latticeNumber},</if>
+            <if test="null!=name"> name = #{name},</if>
+            <if test="null!=yardId"> yard_Id = #{yardId},</if>
         </trim>
         where device_id = #{deviceId}
     </update>
+<?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.sign.in.resource.LinggangSignInResourceMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.sign.in.resource.LinggangSignInResource">
+        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="sign_id" jdbcType="BIGINT" property="signId"/>
+        <result column="index" jdbcType="INTEGER" property="index"/>
+        <result column="Resource_type" jdbcType="INTEGER" property="resourceType"/>
+        <result column="time" jdbcType="TIMESTAMP" property="time"/>
+        <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="path" jdbcType="VARCHAR" property="path"/>
+    </resultMap>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ruoyi.domain.sign.in.resource.LinggangSignInResource">
+        INSERT INTO Sign_in_Resource <include refid="insertSelectiveColumn"></include>
+        <include refid="insertSelectiveValue"></include>
+    </insert>
+
+    <sql id="columns">
+        id
+        ,  sign_id   ,  index   ,  Resource_type   ,  time   ,  create_by   ,  create_time   ,  update_by   ,  update_time   ,  path
+    </sql>
+
+    <sql id="insert_columns">
+        id
+        ,  sign_id  ,  index  ,  Resource_type  ,  time  ,  create_by  ,  create_time  ,  update_by  ,  update_time  ,  path
+    </sql>
+
+    <sql id="insert_values">
+        #{id}
+        ,
+        #{signId},
+        #{index},
+        #{resourceType},
+        #{time},
+        #{createBy},
+        #{createTime},
+        #{updateBy},
+        #{updateTime},
+        #{path}
+    </sql>
+
+    <sql id="insertSelectiveColumn">
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null!=id">id,</if>
+            <if test="null!=signId">sign_id,</if>
+            <if test="null!=index">index,</if>
+            <if test="null!=resourceType">Resource_type,</if>
+            <if test="null!=time">time,</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!=path">path,</if>
+        </trim>
+    </sql>
+
+    <sql id="insertSelectiveValue">
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null!=id">#{id,jdbcType=BIGINT},</if>
+            <if test="null!=signId">#{signId,jdbcType=BIGINT},</if>
+            <if test="null!=index">#{index,jdbcType=INTEGER},</if>
+            <if test="null!=resourceType">#{resourceType,jdbcType=INTEGER},</if>
+            <if test="null!=time">#{time,jdbcType=TIMESTAMP},</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!=path">#{path,jdbcType=VARCHAR},</if>
+        </trim>
+    </sql>
+
+    <sql id="updateByPrimaryKeySelectiveSql">
+        <set>
+            <if test="null!=id">id = #{id,jdbcType=BIGINT},</if>
+            <if test="null!=signId">sign_id = #{signId,jdbcType=BIGINT},</if>
+            <if test="null!=index">index = #{index,jdbcType=INTEGER},</if>
+            <if test="null!=resourceType">Resource_type = #{resourceType,jdbcType=INTEGER},</if>
+            <if test="null!=time">time = #{time,jdbcType=TIMESTAMP},</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!=path">path = #{path,jdbcType=VARCHAR},</if>
+        </set>
+    </sql>
+
+    <sql id="where">
+        <if test="null!=id">AND id = #{id,jdbcType=BIGINT},</if>
+        <if test="null!=signId">AND sign_id = #{signId,jdbcType=BIGINT},</if>
+        <if test="null!=index">AND index = #{index,jdbcType=INTEGER},</if>
+        <if test="null!=resourceType">AND Resource_type = #{resourceType,jdbcType=INTEGER},</if>
+        <if test="null!=time">AND time = #{time,jdbcType=TIMESTAMP},</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!=path">AND path = #{path,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.venue.info.LinggangVenueInfoMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.venue.info.LinggangVenueInfo">
+        <id column="ID" jdbcType="INTEGER" property="id"/>
+        <result column="park_Code" jdbcType="VARCHAR" property="parkCode"/>
+        <result column="park_Addr" jdbcType="VARCHAR" property="parkAddr"/>
+        <result column="del_flag" jdbcType="BIT" property="delFlag"/>
+        <result column="create_by" jdbcType="VARCHAR" property="createBy"/>
+        <result column="crate_time" jdbcType="TIMESTAMP" property="crateTime"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="name" jdbcType="VARCHAR" property="name"/>
+    </resultMap>
+
+    <insert id="insertSelective" keyColumn="ID" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ruoyi.domain.venue.info.LinggangVenueInfo">
+        INSERT INTO venue_info
+        <include refid="insertSelectiveColumn"></include>
+        <include refid="insertSelectiveValue"></include>
+    </insert>
+
+    <sql id="columns">
+        ID
+        ,  park_Code   ,  park_Addr   ,  del_flag   ,  create_by   ,  crate_time   ,  update_by   ,  update_time   ,  name
+    </sql>
+
+    <sql id="insert_columns">
+        ID
+        ,  park_Code  ,  park_Addr  ,  del_flag  ,  create_by  ,  crate_time  ,  update_by  ,  update_time  ,  name
+    </sql>
+
+    <sql id="insert_values">
+        #{id}
+        ,
+        #{parkCode},
+        #{parkAddr},
+        #{delFlag},
+        #{createBy},
+        #{crateTime},
+        #{updateBy},
+        #{updateTime},
+        #{name}
+    </sql>
+
+    <sql id="insertSelectiveColumn">
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null!=id">ID,</if>
+            <if test="null!=parkCode">park_Code,</if>
+            <if test="null!=parkAddr">park_Addr,</if>
+            <if test="null!=delFlag">del_flag,</if>
+            <if test="null!=createBy">create_by,</if>
+            <if test="null!=crateTime">crate_time,</if>
+            <if test="null!=updateBy">update_by,</if>
+            <if test="null!=updateTime">update_time,</if>
+            <if test="null!=name">name,</if>
+        </trim>
+    </sql>
+
+    <sql id="insertSelectiveValue">
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null!=id">#{id,jdbcType=INTEGER},</if>
+            <if test="null!=parkCode">#{parkCode,jdbcType=VARCHAR},</if>
+            <if test="null!=parkAddr">#{parkAddr,jdbcType=VARCHAR},</if>
+            <if test="null!=delFlag">#{delFlag,jdbcType=BIT},</if>
+            <if test="null!=createBy">#{createBy,jdbcType=VARCHAR},</if>
+            <if test="null!=crateTime">#{crateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=updateBy">#{updateBy,jdbcType=VARCHAR},</if>
+            <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=name">#{name,jdbcType=VARCHAR},</if>
+        </trim>
+    </sql>
+
+    <sql id="updateByPrimaryKeySelectiveSql">
+        <set>
+            <if test="null!=id">ID = #{id,jdbcType=INTEGER},</if>
+            <if test="null!=parkCode">park_Code = #{parkCode,jdbcType=VARCHAR},</if>
+            <if test="null!=parkAddr">park_Addr = #{parkAddr,jdbcType=VARCHAR},</if>
+            <if test="null!=delFlag">del_flag = #{delFlag,jdbcType=BIT},</if>
+            <if test="null!=createBy">create_by = #{createBy,jdbcType=VARCHAR},</if>
+            <if test="null!=crateTime">crate_time = #{crateTime,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!=name">name = #{name,jdbcType=VARCHAR},</if>
+        </set>
+    </sql>
+
+    <sql id="where">
+        <if test="null!=id">AND ID = #{id,jdbcType=INTEGER},</if>
+        <if test="null!=parkCode">AND park_Code = #{parkCode,jdbcType=VARCHAR},</if>
+        <if test="null!=parkAddr">AND park_Addr = #{parkAddr,jdbcType=VARCHAR},</if>
+        <if test="null!=delFlag">AND del_flag = #{delFlag,jdbcType=BIT},</if>
+        <if test="null!=createBy">AND create_by = #{createBy,jdbcType=VARCHAR},</if>
+        <if test="null!=crateTime">AND crate_time = #{crateTime,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!=name">AND name = #{name,jdbcType=VARCHAR},</if>
+    </sql>
+</mapper>
 \ No newline at end of file