酒测比对失败

liujun001
1 parent 467471bd
Showing 4 changed files with 100 additions and 2 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/RemindDriverKeyLocalController.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/scheduling/LinggangSchedulingService.java
@@ -3,6 +3,7 @@ package com.ruoyi.controller.dss;
 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.ConstSignInConstSignInProperties;
 import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -477,10 +478,15 @@ public class DssDriverController extends BaseController {
         signIn.setDeviceId(dto.getDevice());
 //        signIn.setImage();
         signIn.setJobCode(dto.getStaffCode());
-        signIn.setAlcoholIntake(Convert.toBigDecimal(dto.getTestValue()));
+
         signIn.setCreateTime(dto.getSignTime());
         signIn.setType(1);
+        if(Objects.nonNull(dto.getTestValue())) {
+            signIn.setAlcoholFlag(ConstSignInConstSignInProperties.ALCOHOL_FLAG_YES);
+            signIn.setAlcoholIntake(Convert.toBigDecimal(dto.getTestValue()));
+        }
+
 //        SysDictData sysDictData = querySystData(null,"drunkenness");
 //        if(Objects.nonNull(sysDictData)){
 //
@@ -2,11 +2,22 @@ package com.ruoyi.controller.dss;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.dss.key.location.vo.RemindKeyInfoLocalVo;
 import com.ruoyi.domain.dss.scheling.dto.RemindDriverReportDTO;
 import com.ruoyi.domain.dss.scheling.vo.RemindDriverReportVo;
+import com.ruoyi.domain.key.location.LinggangKeyWorkLocation;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.service.IEquipmentService;
+import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+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.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
 /**
  * @author liujun
@@ -25,6 +38,12 @@ import javax.validation.Valid;
 @Api(tags = "【对接】钥匙提醒功能")
 public class RemindDriverKeyLocalController extends BaseController {
+    @Autowired
+    private LinggangSchedulingService linggangSchedulingService;
+    @Autowired
+    private LinggangKeyWorkLocationService linggangKeyWorkLocationService;
+    @Autowired
+    private IEquipmentService equipmentService;
     @ApiOperation("司机提醒信息")
     @PostMapping(value = "/remind/driver/key/local/report")
@@ -33,7 +52,68 @@ public class RemindDriverKeyLocalController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+        LinggangScheduling scheduling = new LinggangScheduling();
+        scheduling.setJobCode(request.getJobCode());
-        return null;
+        scheduling.setStartScheduleDate(request.getDate());
+        scheduling.setEndScheduleDate(DateUtils.addDays(request.getDate(), 1));
+
+        OrderEntity orderEntity = new OrderEntity();
+        orderEntity.setOrder("ascending");
+        orderEntity.setProp("fcsjT");
+
+        List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(scheduling, orderEntity);
+        int size = CollectionUtils.size(linggangSchedulings);
+
+        List<LinggangKeyWorkLocation> linggangKeyWorkLocations = null;
+        List<Equipment> equipments = null;
+
+        if (0 < size) {
+            Set<Long> schedulingIds = linggangSchedulings.stream().map(LinggangScheduling::getId).collect(Collectors.toSet());
+            linggangKeyWorkLocations = linggangKeyWorkLocationService.listRecent(null, schedulingIds);
+            if (CollectionUtils.isNotEmpty(linggangKeyWorkLocations)) {
+                Set<String> deviceIds = linggangKeyWorkLocations.stream().map(LinggangKeyWorkLocation::getDevice).collect(Collectors.toSet());
+                equipments = equipmentService.listNameAndIDBydeviceIds(deviceIds);
+            }
+        }
+        RemindDriverReportVo reportVo = new RemindDriverReportVo();
+        reportVo.setCount(size);
+
+        if (CollectionUtils.isNotEmpty(linggangKeyWorkLocations)) {
+            List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList = new ArrayList<>();
+            for (int i = 0; i < size; i = i + 2) {
+                RemindKeyInfoLocalVo localVo = new RemindKeyInfoLocalVo();
+                localVo.setNbbm(linggangSchedulings.get(i).getNbbm());
+                int index = i;
+
+                Optional<LinggangKeyWorkLocation> optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), linggangSchedulings.get(index).getId())).findFirst();
+                if (optional.isPresent()) {
+                    localVo.setKeyInfoStatus(optional.get().getType());
+                    localVo.setYardName(optional.get().getYardName());
+
+                    if (CollectionUtils.isNotEmpty(equipments)) {
+                        Optional<LinggangKeyWorkLocation> finalOptional = optional;
+                        Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), finalOptional.get().getDevice())).findFirst();
+                        equipmentOptional.ifPresent(equipment -> localVo.setEquipmentName(equipment.getName()));
+                    }
+
+                    if (i + 1 < size) {
+                        optional = linggangKeyWorkLocations.stream().filter(kl -> Objects.equals(kl.getSchedulingId(), linggangSchedulings.get(index).getId())).findFirst();
+                        if (optional.isPresent()) {
+                            localVo.setReturnYardName(optional.get().getYardName());
+                            if (CollectionUtils.isNotEmpty(equipments)) {
+                                Optional<LinggangKeyWorkLocation> finalOptional = optional;
+                                Optional<Equipment> equipmentOptional = equipments.stream().filter(e -> Objects.equals(e.getDeviceId(), finalOptional.get().getDevice())).findFirst();
+                                equipmentOptional.ifPresent(equipment -> localVo.setReturnEquipmentName(equipment.getName()));
+                            }
+                        }
+                    }
+                }
+                remindKeyInfoLocalVoList.add(localVo);
+            }
+            reportVo.setRemindKeyInfoLocalVoList(remindKeyInfoLocalVoList);
+        }
+
+        return ResponseResult.success(reportVo);
     }
 }
@@ -61,6 +61,16 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     }
     @Override
+    public List<LinggangScheduling> list(LinggangScheduling entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
+        switchScheduleDate(wrapper, entity);
+        if (Objects.nonNull(orderEntity)) {
+            orderColumn(wrapper, orderEntity);
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public List<LinggangScheduling> list(LinggangScheduling entity, Collection<Long> schedulingIds) {
         LambdaQueryWrapper<LinggangScheduling> wrapper = null;
         if (Objects.isNull(entity)) {
@@ -23,6 +23,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
      */
     List<LinggangScheduling> list(LinggangScheduling entity);
+    List<LinggangScheduling> list(LinggangScheduling entity, OrderEntity orderEntity);
+
     List<LinggangScheduling> list(LinggangScheduling entity, Collection<Long> schedulingIds);
     List<LinggangScheduling> listByCZ(LinggangScheduling entity);