Merge remote-tracking branch 'origin/lingang' into lingang

liujun001
2 parents 69ee026d 1bb72550
Showing 3 changed files with 17 additions and 20 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/RemindDriverKeyLocalController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/scheling/vo/RemindDriverReportVo.java
Bsth-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -16,6 +16,7 @@ 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.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
@@ -58,6 +59,7 @@ public class RemindDriverKeyLocalController extends BaseController {
         scheduling.setStartScheduleDate(request.getDate());
         scheduling.setEndScheduleDate(DateUtils.addDays(request.getDate(), 1));
+
         OrderEntity orderEntity = new OrderEntity();
         orderEntity.setOrder("ascending");
         orderEntity.setProp("fcsjT");
@@ -77,7 +79,7 @@ public class RemindDriverKeyLocalController extends BaseController {
             }
         }
         RemindDriverReportVo reportVo = new RemindDriverReportVo();
-        reportVo.setCount(size);
+        reportVo.setCount(linggangSchedulings.stream().filter(ls-> StringUtils.equalsAnyIgnoreCase(ls.getBcType(),"out")).count());
         if (CollectionUtils.isNotEmpty(linggangKeyWorkLocations)) {
             List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList = new ArrayList<>();
@@ -95,6 +97,9 @@ public class RemindDriverKeyLocalController extends BaseController {
                         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 == 0){
+
+                        }
                     }
                     if (i + 1 < size) {
@@ -109,6 +114,9 @@ public class RemindDriverKeyLocalController extends BaseController {
                         }
                     }
                 }
+                if(i == 0){
+                    reportVo.setCurrentKeyLocaltion(localVo.getEquipmentName());
+                }
                 remindKeyInfoLocalVoList.add(localVo);
             }
             reportVo.setRemindKeyInfoLocalVoList(remindKeyInfoLocalVoList);
@@ -25,7 +25,10 @@ public class RemindDriverReportVo implements Serializable {
     private static final long serialVersionUID = 2852709680924849711L;
     @ApiModelProperty(value = "当天有多少个班次")
-    private Integer count;
+    private Long count;
+    @ApiModelProperty(value = "最近班车钥匙所在位置")
+    private String currentKeyLocaltion;
+
     @ApiModelProperty(value = "钥匙地址提醒信息")
     private List<RemindKeyInfoLocalVo> remindKeyInfoLocalVoList;
 }
 package com.ruoyi.system.domain;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.util.Date;
 /**
@@ -109,19 +108,6 @@ public class SysNotice extends BaseEntity
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("jobCode", getJobCode())
-            .append("planTime", getPlanTime())
-            .toString();
+        return JSON.toJSONString(this);
     }
 }