酒测未通过审核

liujun001
1 parent fac64741
Showing 6 changed files with 94 additions and 46 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/location/LinggangKeyWorkLocation.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/mapper/key/location/LinggangKeyWorkLocationMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
Bsth-admin/src/main/resources/mapper/key/location/LinggangKeyWorkLocationMapper.xml
@@ -749,6 +749,7 @@ public class KeyBoxController extends BaseController {
             location.setScheduleDate(DateUtil.shortDate(dto.getTime()));
             location.setType(item.getState());
             location.setPlate(item.getPlate());
+            location.setTime(dto.getTime());
             if (CollectionUtils.isNotEmpty(schedulings)) {
                 Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
                 if (opt.isPresent()) {
@@ -114,6 +114,12 @@ public class LinggangKeyWorkLocation {
     @TableField(exist = false)
     private Set<Integer> types;
+    @TableField(exist = false)
+    private Date time;
+
+    @TableField(exist = false)
+    private Long zdsjT;
+
     public enum LinggangKeyWorkLocationEventTypeEnum {
         TAKE_OUT(0, "取出"),
@@ -271,15 +271,6 @@ public class DriverJob implements InitializingBean {
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setStartScheduleDate(DateUtil.shortDate(date));
         scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
-        scheduling.setType(type);
-        if(Objects.isNull(schedulingService)){
-            schedulingService = SpringUtils.getBean(LinggangSchedulingService.class);
-        }
-        Integer count = schedulingService.countId(scheduling);
-        if (Objects.nonNull(count) && count > 0) {
-            log.info("[{}]排班数据已经存在", date);
-            return;
-        }
         Set<Long> idSets = null;
         if (isSameDay) {
@@ -291,6 +282,18 @@ public class DriverJob implements InitializingBean {
             }
         }
+        scheduling.setType(type);
+        if(Objects.isNull(schedulingService)){
+            schedulingService = SpringUtils.getBean(LinggangSchedulingService.class);
+        }
+        Integer count = schedulingService.countId(scheduling);
+        if (Objects.nonNull(count) && count > 0) {
+            log.info("[{}]排班数据已经存在", date);
+            return;
+        }
+
+
+
 //        String url = getSchedulingInfoPlan;
         try {
@@ -6,7 +6,9 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
+import java.util.Map;
 @Mapper
@@ -20,4 +22,6 @@ public interface LinggangKeyWorkLocationMapper extends BaseMapper&lt;LinggangKeyWor
     List<LinggangKeyWorkLocation> listOfDeviceKeyIdScheduleDate(@Param("localtions") List<LinggangKeyWorkLocation> locations);
     List<LinggangKeyWorkLocation> listRecent(@Param("localtions") Collection<LinggangKeyWorkLocation> locations);
+
+    List<LinggangKeyWorkLocation> listRecentDates(@Param("keyInfoIds") Collection<Integer> keyInfoIds, @Param("dates")List<Map<String, Date>> dates);
 }
 \ No newline at end of file
@@ -77,7 +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);
+        switchTypes(entity, countWrapper);
         int count = count(countWrapper);
         List<LinggangKeyWorkLocation> lists = Collections.emptyList();
@@ -85,7 +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);
+            switchTypes(entity, selectWrapper);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -110,9 +110,9 @@ 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());
+    private static void switchTypes(LinggangKeyWorkLocation entity, LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper) {
+        if (CollectionUtils.isNotEmpty(entity.getTypes())) {
+            wrapper.in(LinggangKeyWorkLocation::getType, entity.getTypes());
         }
     }
@@ -120,7 +120,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     public List<LinggangKeyWorkLocation> list(LinggangKeyWorkLocation entity) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>(entity);
         switchTime(entity, wrapper);
-        switchTypes(entity,wrapper);
+        switchTypes(entity, wrapper);
         return list(wrapper);
     }
@@ -136,15 +136,15 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     @Override
     public List<LinggangKeyWorkLocation> listRecent(LinggangKeyWorkLocation entity, Collection<Long> schedulingIds) {
         LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = null;
-        if(Objects.isNull(entity)){
+        if (Objects.isNull(entity)) {
             wrapper = new LambdaQueryWrapper<>();
-        }else {
+        } else {
             wrapper = new LambdaQueryWrapper<>(entity);
         }
         switchTime(entity, wrapper);
-        if(CollectionUtils.isNotEmpty(schedulingIds)){
-            wrapper.in(LinggangKeyWorkLocation::getSchedulingId,schedulingIds);
+        if (CollectionUtils.isNotEmpty(schedulingIds)) {
+            wrapper.in(LinggangKeyWorkLocation::getSchedulingId, schedulingIds);
         }
         return list(wrapper);
     }
@@ -192,22 +192,27 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
         return linggangKeyWorkLocationMapper.listRecent(locations);
     }
-    private List<LinggangKeyWorkLocation> listRecentDates(Collection<Date> dates,Set<Integer> keyInfoIds) {
+    private List<LinggangKeyWorkLocation> listRecentDates(Collection<Date> dates, Set<Integer> keyInfoIds) {
         if (CollectionUtils.isEmpty(dates)) {
             return Collections.emptyList();
         }
-        LambdaQueryWrapper<LinggangKeyWorkLocation> wrapper = new LambdaQueryWrapper<>();
-        if(CollectionUtils.isNotEmpty(keyInfoIds)){
-            wrapper.in(LinggangKeyWorkLocation::getKeyInfoId,keyInfoIds);
+        if (CollectionUtils.isEmpty(keyInfoIds)) {
+            keyInfoIds = null;
         }
+
+        List<Map<String,Date>> dateMaps = new ArrayList<>();
         for (Date date : dates) {
-            Date endDate = DateUtils.addDays(date,1);
-            wrapper.or().between(LinggangKeyWorkLocation::getScheduleDate,date,endDate);
+            Date endDate = DateUtils.addDays(date, 1);
+
+            Map<String,Date> maps = new HashMap<>();
+            maps.put("startDate",date);
+            maps.put("endDate",endDate);
+            dateMaps.add(maps);
         }
-        return list(wrapper);
+        return linggangKeyWorkLocationMapper.listRecentDates(keyInfoIds,dateMaps);
     }
     // @Override
@@ -268,22 +273,22 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean insertJob(String timeStr,Set<Long> schedulingIds) {
+    public boolean insertJob(String timeStr, Set<Long> schedulingIds) {
         try {
-            if(CollectionUtils.isNotEmpty(schedulingIds)){
-              List<LinggangKeyWorkLocation> workLocations =  listRecent(null,schedulingIds);
-              if(CollectionUtils.isNotEmpty(workLocations)){
-                 Set<Long> ids = workLocations.stream().map(LinggangKeyWorkLocation::getId).collect(Collectors.toSet());
-                 if(CollectionUtils.isNotEmpty(ids)){
-                     removeByIds(ids);
-                 }
-              }
+            if (CollectionUtils.isNotEmpty(schedulingIds)) {
+                List<LinggangKeyWorkLocation> workLocations = listRecent(null, schedulingIds);
+                if (CollectionUtils.isNotEmpty(workLocations)) {
+                    Set<Long> ids = workLocations.stream().map(LinggangKeyWorkLocation::getId).collect(Collectors.toSet());
+                    if (CollectionUtils.isNotEmpty(ids)) {
+                        removeByIds(ids);
+                    }
+                }
             }
             Date date = DateUtil.YYYY_MM_DD_LINK.parse(timeStr);
             LinggangKeyWorkLocation workLocation = new LinggangKeyWorkLocation();
             workLocation.setStartScheduleDate(date);
-            workLocation.setEndScheduleDate(DateUtils.addDays(date,1));
+            workLocation.setEndScheduleDate(DateUtils.addDays(date, 1));
             Integer count = countId(workLocation);
             if (Objects.nonNull(count) && count > 0) {
                 log.error("当天的数据已经存在:[{}]；[{}]", timeStr, count);
@@ -353,8 +358,9 @@ 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()).set(LinggangKeyWorkLocation::getType, location.getType());
-        wrapper.eq(LinggangKeyWorkLocation::getId, location.getId()).ne(LinggangKeyWorkLocation::getType, location.getType());
+        wrapper.set(LinggangKeyWorkLocation::getEventType, location.getEventType()).set(LinggangKeyWorkLocation::getUpdateTime, new Date())
+                .set(LinggangKeyWorkLocation::getType, location.getType()).set(LinggangKeyWorkLocation::getDevice,location.getDevice());
+        wrapper.eq(LinggangKeyWorkLocation::getId, location.getId());
         return update(wrapper);
     }
@@ -438,27 +444,26 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private ResponseResult<List<LinggangKeyWorkLocation>> checkTaskKey(List<LinggangKeyWorkLocation> locations, LinggangKeyWorkLocation.LinggangKeyWorkLocationTypeEnum typeEnum) {
-        Set<Integer> keyCodes = locations.stream().filter(l->Objects.nonNull(l.getKeyInfoId())).map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
+        Set<Integer> keyCodes = locations.stream().filter(l -> Objects.nonNull(l.getKeyInfoId())).map(LinggangKeyWorkLocation::getKeyInfoId).collect(Collectors.toSet());
         List<KeyInfo> keyInfos = null;
-        if(CollectionUtils.isNotEmpty(keyCodes)){
+        if (CollectionUtils.isNotEmpty(keyCodes)) {
             keyInfos = keyInfoService.listByIds(keyCodes);
         }
         Set<Integer> keyIds = null;
         Set<String> plates = locations.stream().map(LinggangKeyWorkLocation::getPlate).collect(Collectors.toSet());
-        if(CollectionUtils.isNotEmpty(plates)){
+        if (CollectionUtils.isNotEmpty(plates)) {
             keyInfos = keyInfoService.listPlateNums(plates);
-            if(CollectionUtils.isNotEmpty(keyInfos)){
+            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,keyIds).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("无法找到钥匙归还信息");
         }
@@ -481,6 +486,13 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             return s;
         }).collect(Collectors.toList());
+        Set<Long> schedulingIds = sources.stream().map(LinggangKeyWorkLocation::getSchedulingId).collect(Collectors.toSet());
+        List<LinggangScheduling> schedulings = schedulingService.listByIds(schedulingIds);
+        if (CollectionUtils.isEmpty(schedulings)) {
+            return ResponseResult.error404("无法找到排班信息");
+        }
+
+
         List<LinggangKeyWorkLocation> workLocations = sources;
         locations = locations.stream().map(l -> {
@@ -491,8 +503,14 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
             if (optional.isPresent()) {
                 l.setId(optional.get().getId());
             }
+            Optional<LinggangScheduling> scheOpt = schedulings.stream().filter(s1->Objects.equals(s1.getId(),l.getSchedulingId())).findFirst();
+            if(scheOpt.isPresent()){
+                if(l.getTime().getTime()<scheOpt.get().getZdsjT()){
+                    return null;
+                }
+            }
             return l;
-        }).collect(Collectors.toList());
+        }).filter(obj->Objects.nonNull(obj)).collect(Collectors.toList());
         return ResponseResult.success(locations);
@@ -765,7 +783,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
     private List<LinggangScheduling> querySchedulingByTiime(Date date) {
         LinggangScheduling scheduling = new LinggangScheduling();
         scheduling.setStartScheduleDate(DateUtil.shortDate(date));
-        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),1));
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(), 1));
         scheduling.setBcType(BC_TYPE_OUT);
         List<LinggangScheduling> schedulings = schedulingService.list(scheduling);
         if (CollectionUtils.isEmpty(schedulings)) {
@@ -40,6 +40,22 @@
             <include refid="where"></include>
         </foreach>
     </select>
+    <select id="listRecentDates" resultType="com.ruoyi.domain.key.location.LinggangKeyWorkLocation">
+        select <include refid="columns"></include> from key_work_location
+        where 1=1
+              <if test="null != keyInfoIds">
+                  and key_info_id in
+                  <foreach collection="keyInfoIds" item="item" separator="," open="(" close=")">#{item}</foreach>
+              </if>
+
+            <if test="null!=dates">
+               and (
+                <foreach collection="dates" item="item" separator="or " open="(" close=")">
+                    schedule_date between #{item.startDate} and #{item.endDate}
+                </foreach>
+                )
+            </if>
+    </select>
     <sql id="columns">
         id