guzijian / bsth-alcohol-sign · Commits

Commit 064837e15574b56af3acc6f85cdff23364d628e9

Authored by liujun001
1 parent 0978e53e

酒测未通过审核

Inline Side-by-side
Showing 3 changed files with 18 additions and 22 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
  View file @064837e
... ... @@ -42,6 +42,7 @@ import com.ruoyi.service.dss.FaceService;
42 42 import com.ruoyi.service.scheduling.LinggangSchedulingService;
43 43 import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
44 44 import com.ruoyi.system.service.ISysDictDataService;
  45 +import com.ruoyi.utils.DateUtil;
45 46 import io.swagger.annotations.Api;
46 47 import io.swagger.annotations.ApiOperation;
47 48 import lombok.extern.slf4j.Slf4j;
... ... @@ -524,12 +525,13 @@ public class DssDriverController extends BaseController {
524 525  
525 526 private LinggangScheduling convertScheduling(GetBusPlanListDTO dto) {
526 527 LinggangScheduling scheduling = new LinggangScheduling();
527   - if (Objects.equals(0, dto.getDateType())) {
528   - scheduling.setScheduleDate(new Date());
529   - } else if (Objects.equals(1, dto.getDateType())) {
530   - scheduling.setScheduleDate(DateUtils.addDays(new Date(), 1));
  528 + if (Objects.equals(1, dto.getDateType())) {
  529 + scheduling.setStartScheduleDate(DateUtil.shortDate(DateUtils.addDays(new Date(), 1)));
  530 + }else{
  531 + scheduling.setStartScheduleDate(DateUtil.shortDate(new Date()));
531 532 }
532   -
  533 + scheduling.setEndScheduleDate(DateUtils.addDays(scheduling.getStartScheduleDate(),3));
  534 + scheduling.setType(1);
533 535 return scheduling;
534 536 }
535 537  
... ... @@ -558,7 +560,7 @@ public class DssDriverController extends BaseController {
558 560 }
559 561 }
560 562 vo.setRouteName(scheduling.getLineName());
561   - vo.setFache(new Date(scheduling.getFcsjT() * 100));
  563 + vo.setFache(new Date(scheduling.getFcsjT()));
562 564  
563 565 return vo;
564 566 }).collect(Collectors.toList());
... ...
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
  View file @064837e
... ... @@ -29,12 +29,14 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl<LinggangSchedulin
29 29 public IPage<LinggangScheduling> pageList(Page<LinggangScheduling> page, LinggangScheduling entity, OrderEntity orderEntity) {
30 30 LambdaQueryWrapper<LinggangScheduling> countWrapper = new LambdaQueryWrapper<>(entity);
31 31 countWrapper.select(LinggangScheduling::getId);
  32 + switchScheduleDate(countWrapper,entity);
32 33 int count = count(countWrapper);
33 34  
34 35 List<LinggangScheduling> lists = Collections.emptyList();
35 36 if (count > 0) {
36 37 PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
37 38 LambdaQueryWrapper<LinggangScheduling> selectWrapper = new LambdaQueryWrapper<>(entity);
  39 + switchScheduleDate(selectWrapper,entity);
38 40 orderColumn(selectWrapper, orderEntity);
39 41 lists = list(selectWrapper);
40 42 }
... ...
Bsth-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
  View file @064837e
1 1 package com.ruoyi.web.controller.monitor;
2 2  
3   -import java.util.ArrayList;
4   -import java.util.Collection;
5   -import java.util.HashMap;
6   -import java.util.List;
7   -import java.util.Map;
8   -import java.util.Properties;
9   -import java.util.Set;
10   -import org.springframework.beans.factory.annotation.Autowired;
11   -import org.springframework.data.redis.core.RedisCallback;
12   -import org.springframework.data.redis.core.RedisTemplate;
13   -import org.springframework.security.access.prepost.PreAuthorize;
14   -import org.springframework.web.bind.annotation.DeleteMapping;
15   -import org.springframework.web.bind.annotation.GetMapping;
16   -import org.springframework.web.bind.annotation.PathVariable;
17   -import org.springframework.web.bind.annotation.RequestMapping;
18   -import org.springframework.web.bind.annotation.RestController;
19 3 import com.ruoyi.common.constant.CacheConstants;
20 4 import com.ruoyi.common.core.domain.AjaxResult;
21 5 import com.ruoyi.common.utils.StringUtils;
22 6 import com.ruoyi.system.domain.SysCache;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.data.redis.core.RedisCallback;
  9 +import org.springframework.data.redis.core.RedisTemplate;
  10 +import org.springframework.security.access.prepost.PreAuthorize;
  11 +import org.springframework.web.bind.annotation.*;
  12 +
  13 +import java.util.*;
23 14  
24 15 /**
25 16 * 缓存监控
... ... @@ -42,6 +33,7 @@ public class CacheController
42 33 caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "防重提交"));
43 34 caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "限流处理"));
44 35 caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "密码错误次数"));
  36 + caches.add(new SysCache("sign:in:driver", "签到打卡次数"));
45 37 }
46 38  
47 39 @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
... ...