fix: 可视化大屏-》新增应签未签 -》解决签到地址返回有问题bug

guzijian
1 parent deee7e0e
Showing 5 changed files with 69 additions and 24 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/BigViewController.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/bigViewVo/SignNumberVo.java
Bsth-admin/src/main/java/com/ruoyi/service/BigViewService.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.controller;
 import com.ruoyi.common.global.Result;
 import com.ruoyi.pojo.vo.bigViewVo.FleetInfoVo;
 import com.ruoyi.pojo.vo.bigViewVo.SignInfoVo;
+import com.ruoyi.pojo.vo.bigViewVo.SignNumberVo;
 import com.ruoyi.service.BigViewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,7 +33,7 @@ public class BigViewController {
      */
     @ApiOperation("根据类型获取数值")
     @GetMapping("/queryNumberByType")
-    public Result<Integer> queryNumberByType(@RequestParam("type") String type,@RequestParam("dateKey")String dateKey){
+    public Result<SignNumberVo> queryNumberByType(@RequestParam("type") String type, @RequestParam("dateKey")String dateKey){
         return Result.OK(bigViewService.queryNumberByType(type,dateKey));
     }
+package com.ruoyi.pojo.vo.bigViewVo;
+
+import lombok.Data;
+
+/**
+ * 应签未签
+ * @author 20412
+ */
+@Data
+public class SignNumberVo {
+    private String title;
+    private Integer nowNumber;
+    private Integer allNumber;
+}
@@ -2,6 +2,7 @@ package com.ruoyi.service;
 import com.ruoyi.pojo.vo.bigViewVo.FleetInfoVo;
 import com.ruoyi.pojo.vo.bigViewVo.SignInfoVo;
+import com.ruoyi.pojo.vo.bigViewVo.SignNumberVo;
 import java.util.List;
@@ -17,7 +18,7 @@ public interface BigViewService {
      * @param dateKey
      * @return Integer
      */
-    Integer queryNumberByType(String type,String dateKey);
+    SignNumberVo queryNumberByType(String type, String dateKey);
     /**
      * 获取车队信息
@@ -119,6 +119,7 @@ public class SchedulingService {
         }
         String remark = getRemark(dto, signIn, globalIndex.getIndex());
+        signIn.setRemark(remark);
         // 更新最新的签到记录判断是否需要更新考勤
         // 记录为空直接插入记录
         if (Objects.isNull(dto.get(globalIndex.getIndex()).getSignInId()) || dto.size() == 1) {
@@ -150,7 +151,7 @@ public class SchedulingService {
                 sb.append(DELAY);
             }
             // 在规定时间就还原remark
-        }else {
+        } else {
             sb.append(signIn.getRemark());
         }
         if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())) {
@@ -11,9 +11,9 @@ import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.pojo.vo.bigViewVo.FleetInfoVo;
 import com.ruoyi.pojo.vo.bigViewVo.LineInfo;
 import com.ruoyi.pojo.vo.bigViewVo.SignInfoVo;
+import com.ruoyi.pojo.vo.bigViewVo.SignNumberVo;
 import com.ruoyi.service.BigViewService;
 import com.ruoyi.service.ThreadJobService;
-import com.ruoyi.utils.ConstDateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,12 +50,12 @@ public class BigViewServiceImpl implements BigViewService {
     private NowSchedulingCache cache;
     @Override
-    public Integer queryNumberByType(String type, String dateKey) {
-        Integer x = handleType(type, dateKey);
-        if (x != null) return x;
-        return 0;
+    public SignNumberVo queryNumberByType(String type, String dateKey) {
+        SignNumberVo x = handleType(type, dateKey);
+        return x;
     }
+
     @Override
     public List<FleetInfoVo> queryFleetInfoByFleetName(String dateKey) {
         // 从缓存中读取数据，但是调度表中还好包含飞司售人员信息  需要过滤一下  非司售人员nbbm不会存在
@@ -93,8 +93,8 @@ public class BigViewServiceImpl implements BigViewService {
                 info.setPlanDate(new Date(scheduling.getFcsjT()));
                 info.setSignDate(scheduling.getSignTime());
                 for (SignInResponseVo sign : signInList) {
-                    if (sign.getId().equals(scheduling.getId())) {
-                        info.setAddress(sign.getAddress());
+                    if (sign.getId().equals(scheduling.getSignInId())) {
+                        info.setAddress(sign.getSiteName());
                     }
                 }
                 info.setResult(Objects.isNull(scheduling.getRemark()) ? "未签" : scheduling.getRemark());
@@ -293,56 +293,84 @@ public class BigViewServiceImpl implements BigViewService {
         return personInfoVo;
     }
-    private Integer handleType(String type, String dateKey) {
+    private SignNumberVo handleType(String type, String dateKey) {
         String key = dateKey.replaceAll("-", "");
         Map<String, List<DriverScheduling>> map = cache.getCacheScheduling(key);
         Map<String, Object> typeMap = new HashMap<>(map.size());
+        SignNumberVo vo = new SignNumberVo();
         switch (type) {
             case "device":
-                return schedulingMapper.queryNumberByDevice();
+                vo.setTitle("设备数");
+                vo.setNowNumber(schedulingMapper.queryNumberByDevice());
+                return vo;
             case "line":
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
                         typeMap.put(scheduling.getLineName(), "");
                     }
                 }
-                return typeMap.size();
+                vo.setTitle("线路数");
+                vo.setNowNumber(typeMap.size());
+                return vo;
             case "car":
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
                         typeMap.put(scheduling.getNbbm(), "");
                     }
                 }
-                return typeMap.size();
+                vo.setTitle("车辆数");
+                vo.setNowNumber(typeMap.size());
+                return vo;
             case "sale":
+                Map<String,Object> saleAllMap = new HashMap<>();
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
-                        if (SALE_STRING.equals(scheduling.getPosts()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getNbbm()) && !Objects.isNull(scheduling.getSignInId())) {
-                            typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
+                        if (SALE_STRING.equals(scheduling.getPosts()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getNbbm())) {
+                            if (!Objects.isNull(scheduling.getSignInId())) {
+                                typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
+                            }
+                            saleAllMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
                         }
                     }
                 }
-                return typeMap.size();
+                vo.setTitle("售票员签到");
+                vo.setNowNumber(typeMap.size());
+                vo.setAllNumber(saleAllMap.size());
+                return vo;
             case "driver":
+                Map<String,Object> driverAllMap = new HashMap<>();
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
-                        if (DRIVER_STRING.equals(scheduling.getPosts()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getNbbm()) && !Objects.isNull(scheduling.getSignInId())) {
-                            typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
+                        if (DRIVER_STRING.equals(scheduling.getPosts()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getNbbm())) {
+                            if (!Objects.isNull(scheduling.getSignInId())){
+                                typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
+                            }
+                            driverAllMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
                         }
                     }
                 }
-                return typeMap.size();
+                vo.setTitle("驾驶员签到");
+                vo.setNowNumber(typeMap.size());
+                vo.setAllNumber(driverAllMap.size());
+                return vo;
             case "auxiliary":
+                Map<String,Object> auxiliaryAllMap = new HashMap<>();
                 for (Map.Entry<String, List<DriverScheduling>> entry : map.entrySet()) {
                     for (DriverScheduling scheduling : entry.getValue()) {
-                        if (Objects.isNull(scheduling.getNbbm()) && BC_TYPE_OUT.equals(scheduling.getBcType()) && !Objects.isNull(scheduling.getSignInId())) {
-                            typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
+                        if (Objects.isNull(scheduling.getNbbm()) && BC_TYPE_OUT.equals(scheduling.getBcType())) {
+                            if ( !Objects.isNull(scheduling.getSignInId())){
+                                typeMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
+                            }
+                            auxiliaryAllMap.put(scheduling.getJobCode() + scheduling.getBcType(), "");
                         }
                     }
                 }
-                return typeMap.size();
+                vo.setTitle("辅助人员签到");
+                vo.setNowNumber(typeMap.size());
+                vo.setAllNumber(auxiliaryAllMap.size());
+                return vo;
             default:
-                return 0;
+                return vo;
         }
     }
 }