临港二期

liujun001
1 parent cb1a916d
Showing 24 changed files with 443 additions and 31 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/key/info/KeyInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/key/location/LinggangKeyWorkLocationController.java
Bsth-admin/src/main/java/com/ruoyi/controller/scheduling/LinggangSchedulingController.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/dto/LinggangKeyWorkLocationQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/vo/LinggangKeyWorkLocationVO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/LinggangScheduling.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/dto/LinggangSchedulingUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/scheduling/vo/LinggangSchedulingVO.java
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/carinfo/CarInfoService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/carinfo/CarInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/info/KeyInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -77,7 +77,7 @@ public class RefreshController {
     @GetMapping(value = "/key/info/local")
     @ApiOperation("/key/info/local")
-    @PreAuthorize("@ss.hasPermi('refresh:key:info:local')")
+    //@PreAuthorize("@ss.hasPermi('refresh:key:info:local')")
     public ResponseResult<Boolean> testKeyInfoLocal(@RequestParam(value = "dateStr", required = false) String dateStr) throws ParseException {
         if (StringUtils.isEmpty(dateStr)) {
             dateStr = DateUtil.YYYY_MM_DD_LINK.format(new Date());
@@ -108,7 +108,7 @@ public class RefreshController {
     @PostMapping(value = "/driver/init/image")
     @ApiOperation("driver/init/image")
-    @PreAuthorize("@ss.hasPermi('refresh:driver:init:image')")
+ //   @PreAuthorize("@ss.hasPermi('refresh:driver:init:image')")
     public ResponseResult<Boolean> insertDriverInitImage(@RequestParam("imagePath") String imagePath, @RequestParam("device") String device) {
         if (StringUtils.isEmpty(device)) {
             return ResponseResult.error("注册设备号不能为空");
@@ -179,7 +179,7 @@ public class RefreshController {
     @PostMapping(value = "/driver/init/image/name")
     @ApiOperation("driver/init/image/name")
-    @PreAuthorize("@ss.hasPermi('refresh:driver:init:image:name')")
+  //  @PreAuthorize("@ss.hasPermi('refresh:driver:init:image:name')")
     public ResponseResult<Object> insertDriverInitImageOfName(@RequestParam("imagePath") String imagePath, @RequestParam("device") String device) {
         if (StringUtils.isEmpty(device)) {
             return ResponseResult.error("注册设备号不能为空");
@@ -39,6 +39,7 @@ public class KeyInfoController {
     public String listLimit(@ModelAttribute KeyInfoQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
+
         IPage<KeyInfo> response = KeyInfoService.pageList(new Page<KeyInfo>(page, pageLimit), entity,orderEntity);
         return JSON.toJSONString(convert(response));
 package com.ruoyi.controller.key.location;
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.CarInfo;
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.key.info.KeyInfo;
 import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
 import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationAddDTO;
 import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationQueryDTO;
@@ -12,12 +16,18 @@ import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationUpdateDTO;
 import com.ruoyi.domain.key.location.dto.LinggangKeyWorkLocationUpdateStatusDTO;
 import com.ruoyi.domain.key.location.vo.LinggangKeyWorkLocationVO;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.service.carinfo.CarInfoService;
+import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.key.info.KeyInfoService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.set.TransformedSet;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,9 +37,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 @RestController
 @Api(tags = "钥匙存放地址")
@@ -39,15 +48,53 @@ public class LinggangKeyWorkLocationController extends BaseController {
     private LinggangKeyWorkLocationService linggangKeyWorkLocationService;
     @Autowired
     private LinggangSchedulingService schedulingService;
+    @Autowired
+    private NewDriverService driverService;
+    @Autowired
+    private KeyInfoService keyInfoService;
+    @Autowired
+    private CarInfoService carInfoService;
     @ApiOperation("分页查询")
     @PreAuthorize("@ss.hasPermi('linggang:key:work:location:list:limit:page:limit')")
     @PostMapping(value = "/list/limit/{page}/{pageLimit}")
     public IPage<LinggangKeyWorkLocationVO> listLimit(@ModelAttribute LinggangKeyWorkLocationQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
         LinggangKeyWorkLocation entity = convert(request);
+        if (StringUtils.isNotBlank(request.getNbbm())) {
+            CarInfo carInfo = carInfoService.getOneByNbbm(request.getNbbm());
+            if (Objects.isNull(carInfo)) {
+                entity.setKeyInfoId(-10000);
+            } else {
+                List<KeyInfo> keyInfos = keyInfoService.listPlateNum(carInfo.getPlateNum());
+                if (CollectionUtils.isEmpty(keyInfos)) {
+                    entity.setKeyInfoId(-10000);
+                } else {
+                    Set<Integer> keyIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
+                    entity.setKeyInfoIds(keyIds);
+                }
+            }
+        }
+
+        Set<Integer> types = new HashSet<>();
+        types.add(1);
+        types.add(0);
+        entity.setTypes1(types);
+        List<NewDriver> drivers = null;
+        List<KeyInfo> keyInfos = null;
+        List<CarInfo> carInfos = null;
         IPage<LinggangKeyWorkLocation> response = linggangKeyWorkLocationService.pageList(new Page<LinggangKeyWorkLocation>(page, pageLimit), entity, orderEntity);
+        if (Objects.nonNull(response) && CollectionUtils.isNotEmpty(response.getRecords())) {
+            Set<Integer> keyIds = response.getRecords().stream().map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+            Set<Long> driverIds = response.getRecords().stream().map(LinggangKeyWorkLocation::getCreateBy).collect(Collectors.toSet());
-        return convert(response);
+            drivers = driverService.listOfIdsLon(driverIds);
+            keyInfos = keyInfoService.listByIds(keyIds);
+            if (CollectionUtils.isNotEmpty(keyIds)) {
+                Set<String> plateNums = keyInfos.stream().map(KeyInfo::getPlateNum).collect(Collectors.toSet());
+                carInfos = carInfoService.listPlateNums(plateNums);
+            }
+        }
+        return convert(response, drivers, keyInfos, carInfos);
     }
     @ApiOperation("根据ID查询详情")
@@ -113,30 +160,30 @@ public class LinggangKeyWorkLocationController extends BaseController {
         return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
-    private LinggangScheduling queryScheduling(LinggangKeyWorkLocationUpdateStatusDTO request){
+    private LinggangScheduling queryScheduling(LinggangKeyWorkLocationUpdateStatusDTO request) {
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setJobCode(request.getJobCode());
         scheduling.setStartScheduleDate(DateUtil.shortDate(request.getScheduleDate()));
-        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),1));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
         List<LinggangScheduling> schedulings = schedulingService.list(scheduling);
         int size = CollectionUtils.size(schedulings);
-        if(size > 1){
-           Optional<LinggangScheduling> optional = schedulings.stream().filter(sc->request.getScheduleDate().getTime()-sc.getFcsjT()<300000).findFirst();
-           if(optional.isPresent()){
-               return optional.get();
-           }
-            optional = schedulings.stream().filter(sc->request.getScheduleDate().getTime()-sc.getZdsjT()<300000).findFirst();
-            if(optional.isPresent()){
+        if (size > 1) {
+            Optional<LinggangScheduling> optional = schedulings.stream().filter(sc -> request.getScheduleDate().getTime() - sc.getFcsjT() < 300000).findFirst();
+            if (optional.isPresent()) {
+                return optional.get();
+            }
+            optional = schedulings.stream().filter(sc -> request.getScheduleDate().getTime() - sc.getZdsjT() < 300000).findFirst();
+            if (optional.isPresent()) {
                 return optional.get();
             }
         }
-        if(0 == size){
+        if (0 == size) {
             return null;
-        }else if(1 == size){
+        } else if (1 == size) {
             return schedulings.get(0);
         }
         return null;
@@ -182,19 +229,37 @@ public class LinggangKeyWorkLocationController extends BaseController {
         }).orElseGet(null);
     }
-    private List<LinggangKeyWorkLocationVO> convert(List<LinggangKeyWorkLocation> sources) {
+    private List<LinggangKeyWorkLocationVO> convert(List<LinggangKeyWorkLocation> sources, List<NewDriver> drivers, List<KeyInfo> keyInfos, List<CarInfo> carInfos) {
+        int driverSize = CollectionUtils.size(drivers);
+        int carInfoSize = CollectionUtils.size(carInfos);
+
         return java.util.Optional.ofNullable(sources).map(scs -> {
             return scs.stream().map(source -> {
-                return convert(source);
+                LinggangKeyWorkLocationVO vo = convert(source);
+                if (driverSize > 0) {
+                    Optional<NewDriver> optional = drivers.stream().filter(d -> Objects.equals(Convert.toLong(d.getId()), source.getCreateBy())).findFirst();
+                    optional.ifPresent(newDriver -> vo.setJobCode(newDriver.getJobCode()));
+                }
+
+                if (carInfoSize > 0) {
+                    Optional<KeyInfo> optional = keyInfos.stream().filter(k -> Objects.equals(k.getId(), source.getKeyInfoId())).findFirst();
+                    if (optional.isPresent()) {
+                        Optional<CarInfo> optCar = carInfos.stream().filter(c -> Objects.equals(optional.get().getPlateNum(), c.getPlateNum())).findFirst();
+                        optCar.ifPresent(c -> vo.setNbbm(c.getNbbm()));
+                    }
+                }
+                return vo;
             }).collect(java.util.stream.Collectors.toList());
         }).orElseGet(null);
     }
-    private IPage<LinggangKeyWorkLocationVO> convert(IPage<LinggangKeyWorkLocation> sources) {
+    private IPage<LinggangKeyWorkLocationVO> convert(IPage<LinggangKeyWorkLocation> sources, List<NewDriver> drivers, List<KeyInfo> keyInfos, List<CarInfo> carInfos) {
+
+
         return java.util.Optional.ofNullable(sources).map(scs -> {
             IPage<LinggangKeyWorkLocationVO> target = new Page();
             BeanUtils.copyProperties(scs, target);
-            List<LinggangKeyWorkLocationVO> voNames = convert(scs.getRecords());
+            List<LinggangKeyWorkLocationVO> voNames = convert(scs.getRecords(), drivers, keyInfos, carInfos);
             target.setRecords(voNames);
             return target;
+package com.ruoyi.controller.scheduling;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.domain.scheduling.dto.LinggangSchedulingAddDTO;
+import com.ruoyi.domain.scheduling.dto.LinggangSchedulingQueryDTO;
+import com.ruoyi.domain.scheduling.dto.LinggangSchedulingUpdateDTO;
+import com.ruoyi.domain.scheduling.vo.LinggangSchedulingVO;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.beans.BeanUtils;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+
+import java.util.List;
+import java.util.Date;
+
+import com.ruoyi.domain.OrderEntity;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
+import org.springframework.validation.BindingResult;
+
+
+@RestController
+@Api(tags = "")
+@RequestMapping("linggang/scheduling")
+public class LinggangSchedulingController extends BaseController {
+    @Autowired
+    private LinggangSchedulingService linggangSchedulingService;
+
+    @ApiOperation("分页查询")
+    @PreAuthorize("@ss.hasPermi('linggang:scheduling:list:limit:page:limit')")
+    @PostMapping(value = "/list/limit/{page}/{pageLimit}")
+    public IPage<LinggangSchedulingVO> listLimit(@ModelAttribute LinggangSchedulingQueryDTO request, @ModelAttribute OrderEntity orderEntity, @PathVariable Integer page, @PathVariable Integer pageLimit, org.springframework.ui.Model model) {
+        LinggangScheduling entity = convert(request);
+        entity.setType(1);
+        IPage<LinggangScheduling> response = linggangSchedulingService.pageList(new Page<LinggangScheduling>(page, pageLimit), entity, orderEntity);
+
+        return convert(response);
+    }
+
+    @ApiOperation("根据ID查询详情")
+    @GetMapping(value = "/view/{id}")
+    public com.ruoyi.common.core.domain.ResponseResult<LinggangSchedulingVO> view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
+        LinggangScheduling source = linggangSchedulingService.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<LinggangSchedulingVO>> listSelect( LinggangSchedulingQueryDTO request) {
+//        LinggangScheduling entity = convert(request);
+//        List<LinggangScheduling> selectList = linggangSchedulingService.listOfSelect(entity);
+//        return  com.ruoyi.common.core.domain.ResponseResult.success(convert(selectList));
+//    }
+
+    @PreAuthorize("@ss.hasPermi('linggang:scheduling:export')")
+    @ApiOperation("导出")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestBody LinggangSchedulingQueryDTO request) {
+        LinggangScheduling entity = convert(request);
+        List<LinggangScheduling> list = linggangSchedulingService.list(entity);
+        ExcelUtil<LinggangScheduling> util = new ExcelUtil<LinggangScheduling>(LinggangScheduling.class);
+        util.exportExcel(response, list, "LinggangScheduling");
+    }
+
+    //    @ApiOperation("添加")
+//        @PreAuthorize("@ss.hasPermi('linggang:scheduling:add')")
+//    @PostMapping(value="/add")
+//    public com.ruoyi.common.core.domain.ResponseResult add(@Valid @ModelAttribute LinggangSchedulingAddDTO request, BindingResult bindingResult) {
+//        if(bindingResult.hasErrors()){
+//             return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+//        }
+//        LinggangScheduling entity = convert(request);
+//        entity.setCreateBy(getUserId());
+//        entity.setCreateTime(new Date());
+//        int count = linggangSchedulingService.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:scheduling:update')")
+    @PostMapping(value = "/update")
+    public com.ruoyi.common.core.domain.ResponseResult update(@Valid @ModelAttribute LinggangSchedulingUpdateDTO request, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return com.ruoyi.common.core.domain.ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+        LinggangScheduling entity = convert(request);
+//         entity.setUpdateBy(getUserId());
+//         entity.setUpdateTime(new Date());
+        boolean flag = linggangSchedulingService.updateAlcoholCountByPrimaryKey(entity);
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
+    }
+
+
+    private LinggangScheduling convert(LinggangSchedulingQueryDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangScheduling target = new LinggangScheduling();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+    private LinggangScheduling convert(LinggangSchedulingUpdateDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangScheduling target = new LinggangScheduling();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElse(null);
+    }
+
+
+    private LinggangScheduling convert(LinggangSchedulingAddDTO source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangScheduling target = new LinggangScheduling();
+            BeanUtils.copyProperties(sc, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private LinggangSchedulingVO convert(LinggangScheduling source) {
+        return java.util.Optional.ofNullable(source).map(sc -> {
+            LinggangSchedulingVO target = new LinggangSchedulingVO();
+            BeanUtils.copyProperties(source, target);
+            return target;
+        }).orElseGet(null);
+    }
+
+    private List<LinggangSchedulingVO> convert(List<LinggangScheduling> 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<LinggangSchedulingVO> convert(IPage<LinggangScheduling> sources) {
+        return java.util.Optional.ofNullable(sources).map(scs -> {
+            IPage<LinggangSchedulingVO> target = new Page();
+            BeanUtils.copyProperties(scs, target);
+            List<LinggangSchedulingVO> voNames = convert(scs.getRecords());
+            target.setRecords(voNames);
+
+            return target;
+        }).orElseGet(null);
+    }
+}
 \ No newline at end of file
@@ -116,6 +116,9 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private Set<Integer> types;
+    @TableField(exist = false)
+    private Set<Integer> types1;
+
     private Date time;
     @TableField(exist = false)
 package com.ruoyi.domain.key.location.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import java.util.Date;
+
 @Data
 @ApiModel(value = "钥匙存放地址的查询DTO")
 @Accessors(chain = true)
@@ -74,6 +77,10 @@ public class LinggangKeyWorkLocationQueryDTO implements java.io.Serializable {
     @ApiModelProperty(value="场站编码")
     private String yardCode;
+    private String nbbm;
+
+    private Date time;
+
     @Override
     public String toString() {
 package com.ruoyi.domain.key.location.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -9,6 +10,8 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import java.util.Date;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -76,6 +79,11 @@ public class LinggangKeyWorkLocationVO implements java.io.Serializable {
     @ApiModelProperty(value="场站编码")
     private String yardCode;
+    private Integer type1;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date time;
+    private String nbbm;
+
     @Override
     public String toString() {
@@ -146,6 +146,9 @@ public class LinggangScheduling {
     @TableField(value = "scheduling_type")
     private java.lang.Integer type;
+    @TableField(value = "alcohol_count")
+    private Integer alcoholCount;
+
     @TableField(exist = false)
     private String czCode;
@@ -81,6 +81,8 @@ public class LinggangSchedulingUpdateDTO implements java.io.Serializable {
     @ApiModelProperty(value = "操作人员")
     private String operator;
+    private Integer alcoholCount;
+
     @Override
     public String toString() {
 package com.ruoyi.domain.scheduling.vo;
+import com.ruoyi.common.utils.DateUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,8 +9,10 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import java.util.Date;
+import java.util.Objects;
 @Data
 @NoArgsConstructor
@@ -84,6 +87,39 @@ public class LinggangSchedulingVO implements java.io.Serializable {
     @ApiModelProperty(value = "钥匙ID", example = "1")
     private Integer keyInfoId;
+    private Integer alcoholCount;
+
+    private java.lang.String qdzname;
+
+    private java.lang.String zdzname;
+
+    public String getFcsjTStr() {
+        return formatDate(fcsjT);
+    }
+
+    public String getZdsjTStr() {
+        return formatDate(zdsjT);
+    }
+
+    private String formatDate(Long val) {
+        if (Objects.isNull(val)) {
+            return null;
+        }
+        Date date = new Date(val);
+        return DateUtils.YYYY_MM_DD_HH_MM_SS.format(date);
+    }
+
+    public String getScheduleDateStr() {
+        return Objects.isNull(scheduleDate) ? null : DateUtils.YYYY_MM_DD.format(scheduleDate);
+    }
+
+    public String getBcTypeLabel() {
+        return StringUtils.equalsAnyIgnoreCase("in", bcType) ? "进站" : StringUtils.equalsAnyIgnoreCase("out", bcType) ? "出站" : null;
+    }
+
+    public String getAlcoholFlagLabel() {
+        return Objects.equals(this.getAlcoholFlag(), 1) ? "是" : Objects.equals(this.getAlcoholFlag(), 0) ? "否" : null;
+    }
     @Override
     public String toString() {
@@ -18,6 +18,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -63,17 +64,30 @@ public class SignInController extends BaseController {
             SysDictData source = sysDictDataService.getResourceBaseUrl();
             List<LinggangSignInResource> resources = signInResourceService.listBySignIds(ids);
             if (CollectionUtils.isNotEmpty(resources)) {
+
                 resources.stream().forEach(r -> {
                     Optional<SignInResponseVo> optVo = list.stream().filter(l -> Objects.equals(l.getId(), r.getSignId())).findFirst();
+
                     if (optVo.isPresent()) {
                         if (Objects.equals(r.getResourceType(), 2)) {
                             optVo.get().setVideoURL(sysDictDataService.combationValue(r.getPath(), source));
                         } else {
                             optVo.get().setImage(sysDictDataService.combationValue(r.getPath(), source));
+                            optVo.get().setImageFlag(false);
                         }
                     }
+
                 });
             }
+
+           List<SignInResponseVo> list1 = list.stream().map(vo -> {
+                if ( vo.isImageFlag() && StringUtils.isNotEmpty(vo.getImage())) {
+                    vo.setImage(sysDictDataService.combationValue(vo.getImage(), source));
+                }
+                return vo;
+            }).collect(Collectors.toList());
+
+            tableDataInfo.setRows(list1);
         }
         return tableDataInfo;
@@ -516,7 +516,7 @@ public class SignInServiceV1Impl extends ServiceImpl&lt;SignInMapperV1, SignInV1&gt; i
         signIn.setRemark(remark);
         signIn.setExType(2);
         signIn.setStatus(2);
-        signIn.setType(1);
+//        signIn.setType(1);
     }
@@ -29,6 +29,9 @@ public class SignInResponseVo extends SignIn {
     @ExcelIgnore
     private String VideoURL;
+    @ExcelIgnore
+    private boolean imageFlag = true;
+
     public SignInResponseVo(SignIn signIn){
         this.setDeviceId(signIn.getDeviceId());
@@ -46,9 +46,8 @@ public class SchedulingServiceV1Impl extends ServiceImpl&lt;SchedulingMapperV1, Dri
         try {
             Date date1 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
-            dateStr = DateUtils.FAST_YYYY_MM_DD.format(date);
-            dateStr = StringUtils.join(dateStr, " 00:00:00");
-            Date date2 = DateUtils.FAST_YYYY_MM_DDHHMMSS.parse(dateStr);
+
+            Date date2 = org.apache.commons.lang3.time.DateUtils.addMinutes(date,-80);
             SchedulingDateEntity entity = new SchedulingDateEntity();
             entity.setStartDate(date2);
@@ -588,7 +588,7 @@ public class ThreadJobService {
                 List<LinggangScheduling> schedulings1 = schedulings;
                 List<LinggangScheduling> removeSchedulings = sourceList.stream().filter(s -> {
-                    Optional<LinggangScheduling> opt = schedulings1.stream().filter(s1 -> s1.importEqus(s) && Objects.nonNull(s1.getSignInId())).findFirst();
+                    Optional<LinggangScheduling> opt = schedulings1.stream().filter(s1 -> s1.importEqus(s) && Objects.isNull(s1.getSignInId())).findFirst();
                     if (!opt.isPresent()) {
                         log.debug("需要删除的排班数据:[{}]", s);
                     }
@@ -49,6 +49,8 @@ public interface CarInfoService extends IService&lt;CarInfo&gt; {
      */
     CarInfo getOneByPlateNum(String plateNum);
+    CarInfo getOneByNbbm(String nbbm);
+
     Integer countId(CarInfo entity);
     /**
@@ -50,8 +50,6 @@ public class BigViewServiceV1Impl implements BigViewServiceV1 {
     @Autowired
     private SchedulingServiceV1 schedulingServiceV1;
     @Autowired
-    private IDriverService driverService;
-    @Autowired
     private SignInServiceV1 signInServiceV1;
     @Autowired
@@ -147,6 +147,13 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
     }
     @Override
+    public CarInfo getOneByNbbm(String nbbm) {
+        CarInfo carInfo = new CarInfo();
+        carInfo.setNbbm(nbbm);
+        return getOne(carInfo);
+    }
+
+    @Override
     public Integer countId(CarInfo entity) {
         LambdaQueryWrapper<CarInfo> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(CarInfo::getId);
@@ -91,6 +91,13 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
     }
     @Override
+    public List<KeyInfo> listPlateNum(String plateNum) {
+        LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(KeyInfo::getPlateNum, plateNum);
+        return list(wrapper);
+    }
+
+    @Override
     public List<KeyInfo> list(KeyInfo entity, Collection<String> plateNums) {
         LambdaQueryWrapper<KeyInfo> wrapper = null;
         if (Objects.isNull(entity)) {
@@ -78,11 +78,20 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
      */
     @Override
     public IPage<LinggangKeyWorkLocation> pageList(Page<LinggangKeyWorkLocation> page, LinggangKeyWorkLocation entity, OrderEntity orderEntity) {
+        Date timeDate = entity.getTime();
+        String timeStr = null;
+        if(Objects.nonNull(timeDate)){
+            timeStr = DateUtil.YYYY_MM_DD_LINK.format(timeDate);
+        }
+        entity.setTime(null);
+
         LambdaQueryWrapper<LinggangKeyWorkLocation> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(LinggangKeyWorkLocation::getId);
         switchTime(entity, countWrapper);
         switchTypes(entity, countWrapper);
+        switchTypes1(entity,countWrapper);
         switchKeyInfoIds(entity, countWrapper);
+        switchTime(timeStr,countWrapper);
         int count = count(countWrapper);
         List<LinggangKeyWorkLocation> lists = Collections.emptyList();
@@ -91,7 +100,9 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             LambdaQueryWrapper<LinggangKeyWorkLocation> selectWrapper = new LambdaQueryWrapper<>(entity);
             switchTime(entity, selectWrapper);
             switchTypes(entity, selectWrapper);
+            switchTypes1(entity,selectWrapper);
             switchKeyInfoIds(entity, selectWrapper);
+            switchTime(timeStr,selectWrapper);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -119,6 +130,13 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }
     }
+    private static void switchTime(String timeStr, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper){
+        if(StringUtils.isEmpty(timeStr)){
+            return;
+        }
+        wrapper.likeRight(LinggangKeyWorkLocation::getTime,timeStr);
+    }
+
     private static void switchTypes(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
         if (Objects.isNull(entity) || Objects.isNull(wrapper)) {
             return;
@@ -129,6 +147,16 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }
     }
+    private static void switchTypes1(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if (Objects.isNull(entity) || Objects.isNull(wrapper)) {
+            return;
+        }
+
+        if (CollectionUtils.isNotEmpty(entity.getTypes1())) {
+            wrapper.in(LinggangKeyWorkLocation::getType1, entity.getTypes1());
+        }
+    }
+
     private static void switchKeyInfoIds(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
         if (Objects.isNull(entity) || Objects.isNull(wrapper)) {
             return;
@@ -365,6 +393,19 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                 CalDriverScheduling calDriverScheduling = signInServiceV1.findSchedulingByDateTime(s.getJobCode(), s.getTime(), type);
                 if (Objects.nonNull(calDriverScheduling) && Objects.nonNull(calDriverScheduling.getDriverScheduling())) {
                     s.setSchedulingId(calDriverScheduling.getDriverScheduling().getId());
+
+                    String code = calDriverScheduling.getDriverScheduling().getQdzCode();
+                    if(Objects.equals(type,2)){
+                        code = calDriverScheduling.getDriverScheduling().getZdzCode();
+                    }
+                    LinggangVenueInfo linggangVenueInfo = venueInfoService.getOne(code);
+                    if(Objects.nonNull(linggangVenueInfo)){
+                        s.setYardId(linggangVenueInfo.getId());
+                        s.setYardName(linggangVenueInfo.getName());
+                    }
+
+                    carInfoService.getOneByPlateNum(calDriverScheduling.getDriverScheduling().getNbbm());
+
                 }
             }
@@ -839,6 +880,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             if (Objects.equals(sc.getBcType(), BC_TYPE_OUT)) {
                 location.setType(3);
             }
+            location.setType1(2);
             return location;
         }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
 package com.ruoyi.service.impl.scheduling;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.utils.DateUtils;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.mapper.scheduling.LinggangSchedulingMapper;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -29,9 +32,15 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
      */
     @Override
     public IPage<LinggangScheduling> pageList(Page<LinggangScheduling> page, LinggangScheduling entity, OrderEntity orderEntity) {
+        String scheDateStr = null;
+        if(Objects.nonNull(entity.getScheduleDate())){
+            scheDateStr= DateUtils.YYYY_MM_DD.format(entity.getScheduleDate());
+        }
+        entity.setScheduleDate(null);
         LambdaQueryWrapper<LinggangScheduling> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(LinggangScheduling::getId);
         switchScheduleDate(countWrapper, entity);
+        switchScheduleDateLike(countWrapper,scheDateStr);
         int count = count(countWrapper);
         List<LinggangScheduling> lists = Collections.emptyList();
@@ -39,6 +48,7 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
             LambdaQueryWrapper<LinggangScheduling> selectWrapper = new LambdaQueryWrapper<>(entity);
             switchScheduleDate(selectWrapper, entity);
+            switchScheduleDateLike(selectWrapper,scheDateStr);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -155,6 +165,14 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
         return updateById(entity);
     }
+    @Override
+    public boolean updateAlcoholCountByPrimaryKey(LinggangScheduling entity) {
+        LambdaUpdateWrapper<LinggangScheduling> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(LinggangScheduling::getAlcoholCount,entity.getAlcoholCount());
+        wrapper.eq(LinggangScheduling::getId,entity.getId());
+        return update(wrapper);
+    }
+
     /***根据主键删除数据*/
     @Override
     public boolean deleteById(Integer id) {
@@ -170,6 +188,11 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "scheduleDate")) {
                 wrapper.orderByAsc(LinggangScheduling::getScheduleDate);
             }
+
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "scheduleDateStr")) {
+                wrapper.orderByAsc(LinggangScheduling::getScheduleDate);
+            }
+
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineName")) {
                 wrapper.orderByAsc(LinggangScheduling::getLineName);
             }
@@ -194,9 +217,17 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fcsjT")) {
                 wrapper.orderByAsc(LinggangScheduling::getFcsjT);
             }
+
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fcsjTStr")) {
+                wrapper.orderByAsc(LinggangScheduling::getFcsjT);
+            }
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "zdsjT")) {
                 wrapper.orderByAsc(LinggangScheduling::getZdsjT);
             }
+
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "zdsjTStr")) {
+                wrapper.orderByAsc(LinggangScheduling::getZdsjT);
+            }
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signInId")) {
                 wrapper.orderByAsc(LinggangScheduling::getSignInId);
             }
@@ -228,6 +259,11 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "scheduleDate")) {
                 wrapper.orderByDesc(LinggangScheduling::getScheduleDate);
             }
+
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "scheduleDateStr")) {
+                wrapper.orderByDesc(LinggangScheduling::getScheduleDate);
+            }
+
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "lineName")) {
                 wrapper.orderByDesc(LinggangScheduling::getLineName);
             }
@@ -252,9 +288,17 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fcsjT")) {
                 wrapper.orderByDesc(LinggangScheduling::getFcsjT);
             }
+
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fcsjTStr")) {
+                wrapper.orderByDesc(LinggangScheduling::getFcsjT);
+            }
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "zdsjT")) {
                 wrapper.orderByDesc(LinggangScheduling::getZdsjT);
             }
+
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "zdsjTStr")) {
+                wrapper.orderByDesc(LinggangScheduling::getZdsjT);
+            }
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "signInId")) {
                 wrapper.orderByDesc(LinggangScheduling::getSignInId);
             }
@@ -293,4 +337,10 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
             wrapper.le(LinggangScheduling::getScheduleDate, entity.getEndScheduleDate());
         }
     }
+
+    private void switchScheduleDateLike(LambdaQueryWrapper<LinggangScheduling> wrapper, String scheduleDateStr) {
+        if(StringUtils.isNotBlank(scheduleDateStr)){
+            wrapper.likeRight(LinggangScheduling::getScheduleDate,scheduleDateStr);
+        }
+    }
 }
 \ No newline at end of file
@@ -26,6 +26,8 @@ public interface KeyInfoService extends IService&lt;KeyInfo&gt; {
     List<KeyInfo> listPlateNums(Collection<String> plateNum);
+    List<KeyInfo> listPlateNum(String plateNum);
+
     List<KeyInfo> list(KeyInfo entity,Collection<String> plateNums);
     /***
@@ -57,5 +57,7 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
      */
     boolean updateByPrimaryKey(LinggangScheduling entity);
+    boolean updateAlcoholCountByPrimaryKey(LinggangScheduling entity);
+
     boolean deleteById(Integer id);
 }
 \ No newline at end of file
@@ -137,7 +137,7 @@ ruoyi:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-    profile: /data/test/bath-alcoho-sign/apache-tomcat-8.5.61/webapps/uploadPath
+    profile: /home/test/lingang/apache-tomcat-8.5.61/webapps/uploadPath
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -211,7 +211,7 @@ bsth:
              key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
            # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
         lib:
-             path: /data/test/bath-alcoho-sign/LINUX64
+             path: //home/test/lingang/LINUX64
            # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
         faceFeature:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system