酒测未通过审核

liujun001
1 parent 0978e53e
Showing 3 changed files with 18 additions and 22 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
@@ -42,6 +42,7 @@ import com.ruoyi.service.dss.FaceService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
 import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -524,12 +525,13 @@ public class DssDriverController extends BaseController {
     private LinggangScheduling convertScheduling(GetBusPlanListDTO dto) {
         LinggangScheduling scheduling = new LinggangScheduling();
-        if (Objects.equals(0, dto.getDateType())) {
-            scheduling.setScheduleDate(new Date());
-        } else if (Objects.equals(1, dto.getDateType())) {
-            scheduling.setScheduleDate(DateUtils.addDays(new Date(), 1));
+         if (Objects.equals(1, dto.getDateType())) {
+            scheduling.setStartScheduleDate(DateUtil.shortDate(DateUtils.addDays(new Date(), 1)));
+        }else{
+            scheduling.setStartScheduleDate(DateUtil.shortDate(new Date()));
         }
-
+        scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),3));
+         scheduling.setType(1);
         return scheduling;
     }
@@ -558,7 +560,7 @@ public class DssDriverController extends BaseController {
                     }
                 }
                 vo.setRouteName(scheduling.getLineName());
-                vo.setFache(new Date(scheduling.getFcsjT() * 100));
+                vo.setFache(new Date(scheduling.getFcsjT()));
                 return vo;
             }).collect(Collectors.toList());
@@ -29,12 +29,14 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     public IPage<LinggangScheduling> pageList(Page<LinggangScheduling> page, LinggangScheduling entity, OrderEntity orderEntity) {
         LambdaQueryWrapper<LinggangScheduling> countWrapper = new LambdaQueryWrapper<>(entity);
         countWrapper.select(LinggangScheduling::getId);
+        switchScheduleDate(countWrapper,entity);
         int count = count(countWrapper);
         List<LinggangScheduling> lists = Collections.emptyList();
         if (count > 0) {
             PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
             LambdaQueryWrapper<LinggangScheduling> selectWrapper = new LambdaQueryWrapper<>(entity);
+            switchScheduleDate(selectWrapper,entity);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
 package com.ruoyi.web.controller.monitor;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.SysCache;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
 /**
  * 缓存监控
@@ -42,6 +33,7 @@ public class CacheController
         caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
         caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
         caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
+        caches.add(new SysCache("sign:in:driver", "签到打卡次数"));
     }
     @PreAuthorize("@ss.hasPermi('monitor:cache:list')")