酒测未通过审核

liujun001
1 parent 131c84e9
Showing 10 changed files with 96 additions and 15 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/vo/LoginDriverVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.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
Bsth-admin/src/main/java/com/ruoyi/service/key/info/KeyInfoService.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/mapper/scheduling/LinggangSchedulingMapper.xml
@@ -53,7 +53,10 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -112,7 +115,7 @@ public class DssDriverController extends BaseController {
         if (Objects.isNull(driver)) {
             return ResponseResult.error404();
         }
-        driver = faceService.checkFace(convertLoginDriverDTO(loginDriverDTO));
+//        driver = faceService.checkFace(convertLoginDriverDTO(loginDriverDTO));
         return ResponseResult.success(convertNewDriver(driver));
     }
@@ -365,7 +368,9 @@ public class DssDriverController extends BaseController {
         loginDriverVo.setSignOutType(signInService.signOutType(newDriver));
-        Set<Integer> postSets = new HashSet<>();
+        Collection<Integer> postSets = newDriver.getPostValue();
+
+//        loginDriverVo.setStaffTypeItem(postSets);
         loginDriverVo.setStaffTypeItem(postSets);
         LoginUserInfoVo loginUserInfoVo = new LoginUserInfoVo();
@@ -205,7 +205,7 @@ public class KeyBoxController extends BaseController {
                 nbbms = schedulings.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
             }
-            scheduling.setEndScheduleDate(scheduling.getStartScheduleDate());
+            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(scheduling.getStartScheduleDate(),1));
             List<LinggangScheduling> schedulings1 = schedulingService.listByCZ(scheduling);
             if (CollectionUtils.isNotEmpty(schedulings1)) {
                 nbbms1 = schedulings1.stream().map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
@@ -467,12 +467,18 @@ public class KeyBoxController extends BaseController {
         LinggangKeyWorkLocation locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
         locationEq.setStartScheduleDate(locations.get(0).getScheduleDate());
-
         List<LinggangKeyWorkLocation> locationsOfEq = linggangKeyWorkLocationService.list(locationEq);
         locationEq = new LinggangKeyWorkLocation();
         locationEq.setYardId(sourceEq.getYardId());
         locationEq.setStartScheduleDate(locations.get(0).getScheduleDate());
+        locationEq.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addDays(locationEq.getStartScheduleDate(),1));
+
+        Set<Integer> types = new HashSet<>();
+        types.add(1);
+        types.add(0);
+        locationEq.setTypes(types);
+
         IPage<LinggangKeyWorkLocation> page = linggangKeyWorkLocationService.pageList(new Page<>(dto.getPageNum(), dto.getPageSize()), locationEq, new OrderEntity());
         List<LinggangScheduling> schedulings = Collections.emptyList();
@@ -742,6 +748,7 @@ public class KeyBoxController extends BaseController {
             location.setKey(item.getKey());
             location.setScheduleDate(DateUtil.shortDate(dto.getTime()));
             location.setType(item.getState());
+            location.setPlate(item.getPlate());
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
                 if (opt.isPresent()) {
@@ -9,6 +9,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 @Data
 @Slf4j
@@ -169,6 +175,28 @@ public class NewDriver {
         this.integer1 = integer1;
     }
+    public Collection<Integer> getPostValue(){
+
+        Set<Integer>  postValue = new HashSet<>();
+        if(StringUtils.indexOf(this.posts,"管理员") > -1){
+            postValue.add(3);
+        }
+
+        if(StringUtils.indexOf(this.posts,"司机") > -1){
+            postValue.add(2);
+        }
+
+        if(StringUtils.indexOf(this.posts,"移车员") > -1){
+            postValue.add(4);
+        }
+
+        if(CollectionUtils.isEmpty(postValue)){
+            postValue.add(1);
+        }
+
+        return postValue;
+    }
+
     @Override
     public String toString() {
         return com.alibaba.fastjson2.JSON.toJSONString(this);
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.util.Set;
+import java.util.Collection;
 /**
  * @author liujun
@@ -41,7 +41,7 @@ public class LoginDriverVo {
     @ApiModelProperty("解析后的访问图片地址")
     private String cropFacePhotoUrl;
     @ApiModelProperty("角色编码列表:1员工，2司机，3钥匙柜管理员，4移车员")
-    private Set<Integer> staffTypeItem;
+    private Collection<Integer> staffTypeItem;
     @ApiModelProperty("手环蓝牙名称")
     private String blueTooth;
@@ -12,10 +12,7 @@ import lombok.NoArgsConstructor;
 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;
+import java.util.*;
 @Data
@@ -114,6 +111,9 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private String plate;
+    @TableField(exist = false)
+    private Set<Integer> types;
+
     public enum LinggangKeyWorkLocationEventTypeEnum {
         TAKE_OUT(0, "取出"),
@@ -69,6 +69,16 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
     }
     @Override
+    public List<KeyInfo> listPlateNums(Collection<String> plateNum) {
+        if(CollectionUtils.isEmpty(plateNum)){
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<KeyInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(KeyInfo::getPlateNum, plateNum);
+        return list(wrapper);
+    }
+
+    @Override
     public List<KeyInfo> list(KeyInfo entity, Collection<String> plateNums) {
         LambdaQueryWrapper<KeyInfo> wrapper = null;
         if(Objects.isNull(entity)){
@@ -77,6 +77,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         LambdaQueryWrapper<LinggangKeyWorkLocation> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(LinggangKeyWorkLocation::getId);
         switchTime(entity, countWrapper);
+        switchTypes(entity,countWrapper);
         int count = count(countWrapper);
         List<LinggangKeyWorkLocation> lists = Collections.emptyList();
@@ -84,6 +85,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
             LambdaQueryWrapper<LinggangKeyWorkLocation> selectWrapper = new LambdaQueryWrapper<>(entity);
             switchTime(entity, selectWrapper);
+            switchTypes(entity,selectWrapper);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -108,10 +110,17 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         }
     }
+    private static void switchTypes(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper){
+        if(CollectionUtils.isNotEmpty(entity.getTypes())){
+            wrapper.in(LinggangKeyWorkLocation::getType,entity.getTypes());
+        }
+    }
+
     @Override
     public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
         switchTime(entity, wrapper);
+        switchTypes(entity,wrapper);
         return list(wrapper);
     }
@@ -183,13 +192,21 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return linggangKeyWorkLocationMapper.listRecent(locations);
     }
-    private List<LinggangKeyWorkLocation> listRecentDates(Collection<Date> dates) {
+    private List<LinggangKeyWorkLocation> listRecentDates(Collection<Date> dates,Set<Integer> keyInfoIds) {
         if (CollectionUtils.isEmpty(dates)) {
             return Collections.emptyList();
         }
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(LinggangKeyWorkLocation::getScheduleDate, dates);
+        if(CollectionUtils.isNotEmpty(keyInfoIds)){
+            wrapper.in(LinggangKeyWorkLocation::getKeyInfoId,keyInfoIds);
+        }
+        for (Date date : dates) {
+            Date endDate = DateUtils.addDays(date,1);
+            wrapper.or().between(LinggangKeyWorkLocation::getScheduleDate,date,endDate);
+
+        }
+
         return list(wrapper);
     }
@@ -428,9 +445,20 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             keyInfos = keyInfoService.listByIds(keyCodes);
         }
+        Set<Integer> keyIds = null;
+        Set<String> plates = locations.stream().map(LinggangKeyWorkLocation::getPlate).collect(Collectors.toSet());
+        if(CollectionUtils.isNotEmpty(plates)){
+            keyInfos = keyInfoService.listPlateNums(plates);
+            if(CollectionUtils.isNotEmpty(keyInfos)){
+                keyIds = keyInfos.stream().map(KeyInfo::getId).collect(Collectors.toSet());
+            }
+        }
+
+
         Set<Date> dates = locations.stream().map(LinggangKeyWorkLocation::getScheduleDate).collect(Collectors.toSet());
-        List<LinggangKeyWorkLocation> sources = listRecentDates(dates).stream().filter(s -> !Objects.equals(s.getType(), typeEnum.getValue())).collect(Collectors.toList());
+
+        List<LinggangKeyWorkLocation> sources = listRecentDates(dates,keyIds).stream().filter(s -> !Objects.equals(s.getType(), typeEnum.getValue())).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(sources)) {
             return ResponseResult.error404("无法找到钥匙归还信息");
         }
@@ -22,6 +22,8 @@ public interface KeyInfoService extends IService&lt;KeyInfo&gt; {
     List<KeyInfo> list(Collection<String> codes);
+    List<KeyInfo> listPlateNums(Collection<String> plateNum);
+
     List<KeyInfo> list(KeyInfo entity,Collection<String> plateNums);
     /***
@@ -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/ROOT/uploadPath
+    profile: D:/temp/temp/bsth
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数字计算 char 字符验证
@@ -174,5 +174,6 @@
         <if test="null!=qdzname">AND qdzName = #{qdzname,jdbcType=VARCHAR}, </if>
         <if test="null!=zdzcode">AND zdzCode = #{zdzcode,jdbcType=VARCHAR}, </if>
         <if test="null!=zdzname">AND zdzName = #{zdzname,jdbcType=VARCHAR}, </if>
+        <if test="null!=type">AND scheduling_type = #{type}  </if>
     </sql>
 </mapper>
 \ No newline at end of file