fix: 修复分班无签退问题

guzijian
1 parent d4bd94ed
Showing 8 changed files with 68 additions and 56 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/cache/NowSchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/common/cache/SchedulingCache.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ApplicationUpdateController.java
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/response/ExportReportViewResponseVo.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
ruoyi-admin/src/main/java/com/ruoyi/service/SchedulingService.java
@@ -30,20 +30,20 @@ public class NowSchedulingCache {
     private void cacheNowDaySchedulingInit() {
         // 查询今天和昨天
         for (int i = 0; i > -2; i--) {
-            Map<String, List<DriverScheduling>> resultMap =new HashMap<>(800);
+            Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
             String date = ConstDateUtil.formatDate(ConstDateUtil.getTheSpecifiedNumberOfDaysOfTime(i));
             List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
-            handleResultMap(resultMap,schedulingList);
-            cacheNowDayScheduling.put(date,resultMap);
+            handleResultMap(resultMap, schedulingList);
+            cacheNowDayScheduling.put(date, resultMap);
         }
     }
     private void handleResultMap(Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
         for (DriverScheduling scheduling : schedulingList) {
             List<DriverScheduling> list = resultMap.get(scheduling.getJobCode());
-            if (CollectionUtil.isEmpty(list)){
-                resultMap.put(scheduling.getJobCode(),new ArrayList<>(Arrays.asList(scheduling)));
-            }else {
+            if (CollectionUtil.isEmpty(list)) {
+                resultMap.put(scheduling.getJobCode(), new ArrayList<>(Arrays.asList(scheduling)));
+            } else {
                 list.add(scheduling);
             }
         }
@@ -52,19 +52,20 @@ public class NowSchedulingCache {
     public void setCacheScheduling(String key, Map<String, List<DriverScheduling>> mapValue) {
         cacheNowDayScheduling.put(key, mapValue);
     }
-    public Map<String,List<DriverScheduling>> getCacheScheduling(String key) {
-       return cacheNowDayScheduling.get(key);
+
+    public Map<String, List<DriverScheduling>> getCacheScheduling(String key) {
+        return cacheNowDayScheduling.get(key);
     }
     public void removeCacheSchedulingByKey(String key) {
         cacheNowDayScheduling.remove(key);
     }
-    public List<String> getKeys(){
+    public List<String> getKeys() {
         return new ArrayList<>(cacheNowDayScheduling.keySet());
     }
-    public Integer size(){
+    public Integer size() {
         return cacheNowDayScheduling.size();
     }
@@ -30,7 +30,6 @@ public class SchedulingCache {
     Logger log = LoggerFactory.getLogger(SchedulingCache.class);
-
     //    @Value("${api.url.getSchedulingInfoNew}")
     private static final String getSchedulingInfoUrl = "http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s";
     //    @Value("${api.config.nonce}")
@@ -50,7 +49,6 @@ public class SchedulingCache {
     }
-
     private void schedulingInit() {
         String formatNowDate = ConstDateUtil.formatDate(new Date());
         String url = getUrl(formatNowDate);
@@ -182,11 +180,11 @@ public class SchedulingCache {
         cacheScheduling.remove(key);
     }
-    public List<String> getKeys(){
+    public List<String> getKeys() {
         return new ArrayList<>(cacheScheduling.keySet());
     }
-    public Integer size(){
+    public Integer size() {
         return cacheScheduling.size();
     }
@@ -17,6 +17,7 @@ import java.io.IOException;
 /**
  * 管理应用更新
+ *
  * @author 20412
  */
 @RestController
@@ -62,7 +63,7 @@ public class ApplicationUpdateController {
     @GetMapping("/checkDeviceHeart")
     @ApiOperation("设备心跳检测")
-    public Result<?> checkAppHeart(@Validated @ApiParam @ModelAttribute HeartPackageVo vo){
+    public Result<?> checkAppHeart(@Validated @ApiParam @ModelAttribute HeartPackageVo vo) {
         appService.checkAppHeart(vo);
         return Result.OK();
     }
@@ -35,19 +35,19 @@ public class ReportController {
     @ApiOperation("签到报表集合查询")
     @GetMapping("/list")
     public AjaxResult getList(HttpServletResponse response, @ApiParam @ModelAttribute ReportViewRequestVo requestVo) {
-        return AjaxResult.success(reportService.getReportScrollViewTable(requestVo,response));
+        return AjaxResult.success(reportService.getReportScrollViewTable(requestVo, response));
     }
     @ApiOperation("签到报表集合查询")
     @GetMapping("/bigView")
     public AjaxResult getBigView(HttpServletResponse response, @ApiParam @ModelAttribute ReportViewRequestVo requestVo) {
-        return AjaxResult.success(reportService.getBigView(requestVo,response));
+        return AjaxResult.success(reportService.getBigView(requestVo, response));
     }
     @ApiOperation("获取详情")
     @GetMapping("/detail")
     public AjaxResult getDetail(HttpServletResponse response, @ApiParam @ModelAttribute @Validated ReportViewRequestVo requestVo) {
-        return AjaxResult.success(reportService.getReportDetail(requestVo,response));
+        return AjaxResult.success(reportService.getReportDetail(requestVo, response));
     }
@@ -146,10 +146,21 @@ public class DriverServiceImpl implements IDriverService {
             }
         }
+        LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
+        LocalDateTime signTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
+        long range = ChronoUnit.MINUTES.between(signTime, nowTime);
+        // 如果当前记录靠近签退，但是未到签退小于合法范围 上一次记录未签到，则返回签到记录
+        if (BC_TYPE_IN.equals(timeMap.get(index).getBcType())
+                && range < -60L
+                && Objects.isNull(timeMap.get(index).getSignInId())
+                && Objects.isNull(timeMap.get(index - 1).getSignInId())) {
+            // 定位上次操作
+            index = index - 1;
+        }
+
         // 如果当前记录是异常的记录且还在目前还在签到范围内
         if (!Objects.isNull(timeMap.get(index).getSignInId())) {
             LocalDateTime endTime = ConstDateUtil.getLocalDateTimeByLongTime(timeMap.get(index).getTimestamps());
-            LocalDateTime nowTime = ConstDateUtil.getLocalDateTimeByLongTime(now);
             long nowBetween = ChronoUnit.MINUTES.between(endTime, nowTime);
             // 如果当前有效范围内签到记录无效如酒精测试异常则重复当前操作
             if ((Math.abs(nowBetween) <= 60) && timeMap.get(index).getExType().equals(SIGN_ALCOHOL_EX_NUM) && timeMap.get(index).getBcType().equals(BC_TYPE_OUT)) {
@@ -129,33 +129,33 @@ public class ExportReportViewResponseVo {
         }
     }
-    private void handelSecond(List<DriverScheduling> driverSchedulings, int size) {
+    private void handelSecond(List<DriverScheduling> driverSchedulingList, int size) {
         // 签到
-        this.setSecondPlanSignInTime(new Date(driverSchedulings.get(2).getFcsjT()));
-        this.setSecondActualSignInTime(driverSchedulings.get(2).getSignTime());
-        this.setSecondAlcoholStringIn(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(2).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
-        this.setSecondAlcoholIntakeIn(driverSchedulings.get(2).getAlcoholIntake());
-        this.setSecondSignInResultString(Objects.isNull(driverSchedulings.get(2).getSignInId()) ? "未签到" : driverSchedulings.get(2).getRemark());
+        this.setSecondPlanSignInTime(new Date(driverSchedulingList.get(2).getFcsjT()));
+        this.setSecondActualSignInTime(driverSchedulingList.get(2).getSignTime());
+        this.setSecondAlcoholStringIn(ALCOHOL_FLAG_YES.equals(driverSchedulingList.get(2).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setSecondAlcoholIntakeIn(driverSchedulingList.get(2).getAlcoholIntake());
+        this.setSecondSignInResultString(Objects.isNull(driverSchedulingList.get(2).getSignInId()) ? "未签到" : driverSchedulingList.get(2).getRemark());
         // 签退
-        this.setSecondPlanSignOutTime(new Date(driverSchedulings.get(size - 1).getZdsjT()));
-        this.setSecondActualSignOutTime(driverSchedulings.get(size - 1).getSignTime());
-        this.setSecondAlcoholStringOut(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(size - 1).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
-        this.setSecondAlcoholIntakeOut(driverSchedulings.get(size - 1).getAlcoholIntake());
-        this.setSecondSignInResultString(Objects.isNull(driverSchedulings.get(size -1).getSignInId()) ? "未签退" : driverSchedulings.get(size -1).getRemark());
+        this.setSecondPlanSignOutTime(new Date(driverSchedulingList.get(size - 1).getZdsjT()));
+        this.setSecondActualSignOutTime(driverSchedulingList.get(size - 1).getSignTime());
+        this.setSecondAlcoholStringOut(ALCOHOL_FLAG_YES.equals(driverSchedulingList.get(size - 1).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setSecondAlcoholIntakeOut(driverSchedulingList.get(size - 1).getAlcoholIntake());
+        this.setSecondSignOutResultString(Objects.isNull(driverSchedulingList.get(size -1).getSignInId()) ? "未签退" : driverSchedulingList.get(size -1).getRemark());
     }
-    private void handleFirst(List<DriverScheduling> driverSchedulings, int size) {
+    private void handleFirst(List<DriverScheduling> driverSchedulingList, int size) {
         // 签到
-        this.setPlanSignInTime(new Date(driverSchedulings.get(0).getFcsjT()));
-        this.setActualSignInTime(driverSchedulings.get(0).getSignTime());
-        this.setAlcoholStringIn(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(0).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
-        this.setAlcoholIntakeIn(driverSchedulings.get(0).getAlcoholIntake());
-        this.setSignInResultString(Objects.isNull(driverSchedulings.get(0).getSignInId()) ? "未签到": driverSchedulings.get(0).getRemark());
+        this.setPlanSignInTime(new Date(driverSchedulingList.get(0).getFcsjT()));
+        this.setActualSignInTime(driverSchedulingList.get(0).getSignTime());
+        this.setAlcoholStringIn(ALCOHOL_FLAG_YES.equals(driverSchedulingList.get(0).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setAlcoholIntakeIn(driverSchedulingList.get(0).getAlcoholIntake());
+        this.setSignInResultString(Objects.isNull(driverSchedulingList.get(0).getSignInId()) ? "未签到": driverSchedulingList.get(0).getRemark());
         // 签退
-        this.setPlanSignOutTime(new Date(driverSchedulings.get(size - 1).getZdsjT()));
-        this.setActualSignOutTime(driverSchedulings.get(size - 1).getSignTime());
-        this.setAlcoholStringOut(ALCOHOL_FLAG_YES.equals(driverSchedulings.get(size - 1).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
-        this.setAlcoholIntakeOut(driverSchedulings.get(size - 1).getAlcoholIntake());
-        this.setSignOutResultString(Objects.isNull(driverSchedulings.get(size - 1).getSignInId()) ? "未签退": driverSchedulings.get(size - 1).getRemark());
+        this.setPlanSignOutTime(new Date(driverSchedulingList.get(size - 1).getZdsjT()));
+        this.setActualSignOutTime(driverSchedulingList.get(size - 1).getSignTime());
+        this.setAlcoholStringOut(ALCOHOL_FLAG_YES.equals(driverSchedulingList.get(size - 1).getAlcoholFlag()) ? ALCOHOL_FLAG_YES_STRING : ALCOHOL_FLAG_NO_STRING);
+        this.setAlcoholIntakeOut(driverSchedulingList.get(size - 1).getAlcoholIntake());
+        this.setSignOutResultString(Objects.isNull(driverSchedulingList.get(size - 1).getSignInId()) ? "未签退": driverSchedulingList.get(size - 1).getRemark());
     }
 }
@@ -64,7 +64,7 @@ public class ReportService {
     public List<ReportErrorResponseVo> getErrorReportList(ReportErrorRequestVo request) {
         List<EquipmentExceptionResponseVo> list = exceptionMapper.selectEquipmentExceptionListByVo(request);
-        return list.stream().map(item->{
+        return list.stream().map(item -> {
             ReportErrorResponseVo vo = new ReportErrorResponseVo();
             vo.setRemark(item.getRemark());
             vo.setName(item.getPersonnelName());
@@ -80,11 +80,10 @@ public class ReportService {
     }
-
     public List<ExportReportViewResponseVo> exportReportList(ReportViewRequestVo requestVo, HttpServletResponse response) {
         //  处理天
-        if (requestVo.getExportFlag().equals(DAY)){
-            return getDayReportTableResponseVo(requestVo.getDate(),response);
+        if (requestVo.getExportFlag().equals(DAY)) {
+            return getDayReportTableResponseVo(requestVo.getDate(), response);
         }
         // 处理月
         else if (requestVo.getExportFlag().equals(MONTH)) {
@@ -95,26 +94,26 @@ public class ReportService {
     private List<ExportReportViewResponseVo> getDayReportTableResponseVo(String date, HttpServletResponse response) {
         List<DriverScheduling> schedulingList = schedulingMapper.queryToDay(date, null, null, null);
-        Map<String,List<DriverScheduling>> resultMap = new HashMap<>(800);
+        Map<String, List<DriverScheduling>> resultMap = new HashMap<>(800);
         List<ExportReportViewResponseVo> vo = new ArrayList<>(800);
-        handleResultMap(date,resultMap,schedulingList);
-        handleResultList(vo,resultMap);
+        handleResultMap(date, resultMap, schedulingList);
+        handleResultList(vo, resultMap);
         return vo;
     }
     private void handleResultList(List<ExportReportViewResponseVo> vo, Map<String, List<DriverScheduling>> resultMap) {
         for (String key : resultMap.keySet()) {
             resultMap.get(key).sort(Comparator.comparing(DriverScheduling::getFcsjT));
-            vo.add(new ExportReportViewResponseVo(resultMap.get(key)) );
+            vo.add(new ExportReportViewResponseVo(resultMap.get(key)));
         }
     }
     private void handleResultMap(@NotBlank String date, Map<String, List<DriverScheduling>> resultMap, List<DriverScheduling> schedulingList) {
         for (DriverScheduling item : schedulingList) {
             String key = date + item.getJobCode();
-            if (Objects.isNull(resultMap.get(key))){
-                resultMap.put(key,new ArrayList<>(Arrays.asList(item)));
-            }else {
+            if (Objects.isNull(resultMap.get(key))) {
+                resultMap.put(key, new ArrayList<>(Arrays.asList(item)));
+            } else {
                 resultMap.get(key).add(item);
             }
         }
@@ -136,7 +135,7 @@ public class ReportService {
         LocalDate formatDate = LocalDate.parse(dateString, formatter);
         int month = formatDate.getMonthValue();
         int year = formatDate.getYear();
-        YearMonth yearMonth = YearMonth.of(year,month);
+        YearMonth yearMonth = YearMonth.of(year, month);
         // 获取当前月份的第一天和最后一天日期
         LocalDate firstDay = yearMonth.atDay(1);
@@ -217,6 +217,7 @@ public class SchedulingService {
         int planSignOutCount = 0;
         int actualSignOutCount = 0;
         BeanUtils.copyProperties(list.get(0), vo);
+        String exString = NO_EX;
         for (DriverScheduling scheduling : list) {
             // 获取计划签到|签退次数
             if (scheduling.getBcType().equals(BC_TYPE_OUT)) {
@@ -224,19 +225,20 @@ public class SchedulingService {
                 if (!Objects.isNull(scheduling.getSignInId())) {
                     actualSignInCount = actualSignInCount + 1;
                 }
+
             } else {
                 planSignOutCount = planSignOutCount + 1;
                 if (!Objects.isNull(scheduling.getSignInId())) {
                     actualSignOutCount = actualSignOutCount + 1;
                 }
             }
+
             // 判断是否异常
             if (!SIGN_NO_EX_NUM.equals(scheduling.getExType())) {
-                vo.setExString(HAVE_EX);
-            } else {
-                vo.setExString(NO_EX);
+                exString = HAVE_EX;
             }
         }
+        vo.setExString(exString);
         vo.setPlanSignInCount(planSignInCount);
         vo.setPlanSignOutCount(planSignOutCount);
         vo.setActualSignInCount(actualSignInCount);