设备和场地

liujun001
1 parent 02e1576d
Showing 6 changed files with 40 additions and 7 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/driver/dto/GetBusPlanListDTO.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/location/LinggangKeyWorkLocationServiceImpl.java
@@ -355,7 +355,7 @@ public class DssDriverController extends BaseController {
         SignIn signIn = new SignIn();
         Boolean flag = Boolean.TRUE;
         if (Objects.nonNull(dto.getCheckTime())) {
-            signIn.setCreateTime(dto.getCheckTime());
+            signIn.setStartCreateTime(dto.getCheckTime());
             flag = false;
         }
  
@@ -527,6 +527,10 @@ public class DssDriverController extends BaseController {
                 GetBusPlanListVo vo = new GetBusPlanListVo();
                 vo.setDriverName(scheduling.getName());
                 vo.setSelfCode(scheduling.getNbbm());
+                vo.setStartStation(scheduling.getQdzname());
+
+                String upDown = Objects.equals(0,scheduling.getUpdown())?"1":Objects.equals(1,scheduling.getUpdown())?"2":null;
+                vo.setUpDown(upDown);
                 if (CollectionUtils.isNotEmpty(carInfos)) {
                     Optional<CarInfo> optional = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), scheduling.getNbbm())).findFirst();
                     if (optional.isPresent()) {
@@ -555,6 +559,7 @@ public class DssDriverController extends BaseController {
                 Optional<LinggangScheduling> optional = schedulings.stream().filter(sc -> Objects.equals(sc.getId(), s.getSchedulingId())).findFirst();
                 if (optional.isPresent()) {
                     vo.setRouteName(optional.get().getLineName());
+                    vo.setYarnName(optional.get().getQdzname());
                 }
             }
  
@@ -576,6 +581,17 @@ public class DssDriverController extends BaseController {
             vo.setCheckResult(Convert.toStr(s.getStatus()));
             vo.setDrunkNum(Convert.toStr(s.getAlcoholIntake()));
  
+            switch (s.getExType()){
+                case 44:
+                    vo.setDrunkStatus("11");
+                    break;
+                case  3:
+                    vo.setDrunkStatus("12");
+                    break;
+                default:
+                    vo.setDrunkStatus("0");
+            }
+
             return vo;
         }).collect(Collectors.toList());
     }
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
  
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
  
 /**
  * @author liujun
@@ -27,17 +28,17 @@ public class GetBusPlanListDTO implements java.io.Serializable{
  
     @NotEmpty(message = "卡号不能为空")
     @ApiModelProperty(value = "卡号",required = true)
-    private Integer  driverCode;
+    private String  driverCode;
  
-    @NotEmpty(message = "数据类型为空")
+    @NotNull(message = "数据类型为空")
     @ApiModelProperty(value = "数据类型;0今天，1明天，2/null全部",required = true,example = "1")
     private Integer  dateType;
  
-    @NotEmpty(message = "第几页为空")
+    @NotNull(message = "第几页为空")
     @ApiModelProperty(value = "第几页",required = true,example = "1")
     private Integer    pageNumber;
  
-    @NotEmpty(message = "每页条数为空")
+    @NotNull(message = "每页条数为空")
     @ApiModelProperty(value = "每页条数",required = true,example = "1")
     private Integer    pageRow;
  
@@ -10,6 +10,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.Date;
  
 /**
  * 签到对象 sign_in
@@ -94,7 +95,6 @@ public class SignIn extends BaseEntity {
     @ApiModelProperty("酒精摄入量 52.12")
     private BigDecimal alcoholIntake;
     @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
-
     @ApiModelProperty("异常类型")
     private Integer exType;
  
@@ -105,5 +105,11 @@ public class SignIn extends BaseEntity {
     /***资源类型：1图片；2视频*/
     @Excel(name = "资源类型：1图片；2视频")
     private java.lang.Integer resourceType;
+
+    @TableField(exist = false)
+    private Date startCreateTime;
+
+    @TableField(exist = false)
+    private Date endCreateTime;
 }
  
@@ -117,6 +117,14 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         if (CollectionUtils.isNotEmpty(jobCodes)) {
             wrapper.in(SignIn::getJobCode, jobCodes);
         }
+
+        if(Objects.nonNull(signIn.getStartCreateTime())  && Objects.nonNull(signIn.getEndCreateTime())){
+            wrapper.between(SignIn::getCreateTime,signIn.getStartCreateTime(),signIn.getEndCreateTime());
+        }else if(Objects.nonNull(signIn.getStartCreateTime())){
+            wrapper.ge(SignIn::getCreateTime,signIn.getStartCreateTime());
+        }else if(Objects.nonNull(signIn.getEndCreateTime())){
+            wrapper.le(SignIn::getCreateTime,signIn.getEndCreateTime());
+        }
         return list(wrapper);
     }
  
@@ -2,6 +2,7 @@ package com.ruoyi.service;
  
  
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.cache.NowSchedulingCache;
@@ -523,6 +524,7 @@ public class ThreadJobService {
                     .map(item -> {
                         DriverScheduling scheduling = new DriverScheduling();
                         BeanUtils.copyProperties(item, scheduling, "id");
+                        scheduling.setUpDown(Convert.toInt(item.getUpDown()));
                         return scheduling;
                     })
                     .sorted(Comparator.comparing(DriverScheduling::getFcsjT))
@@ -411,7 +411,7 @@ public class LinggangKeyWorkLocationServiceImpl extends ServiceImpl&lt;LinggangKeyW
                     Objects.equals(d.getDevice(), l.getDevice()) && DateUtils.isSameDay(d.getScheduleDate(), l.getScheduleDate())).findFirst();
             if (optional.isPresent()) {
                 l.setId(optional.get().getId());
-                if (Objects.equals(l.getEventType(), optional.get().getEventType())) {
+                if (Objects.equals(l.getType(), optional.get().getType())) {
                     locationList.add(l);
                     return null;
                 }