guzijian / bsth-alcohol-sign · Commits

Commit 8105bd448a5302691295343f30323bb699a2b554

Authored by liujun001
1 parent 04f3b0e8
build: skipped

优化导入数据

Inline Side-by-side
Showing 8 changed files with 275 additions and 13 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/app/AppSignExceptionController.java 0 → 100644
  View file @8105bd4
  1 +package com.ruoyi.controller.app;
  2 +
  3 +import cn.hutool.core.convert.Convert;
  4 +import com.ruoyi.common.core.controller.BaseController;
  5 +import com.ruoyi.common.core.domain.ResponseResult;
  6 +import com.ruoyi.common.core.domain.entity.SysDictData;
  7 +import com.ruoyi.domain.driver.NewDriver;
  8 +import com.ruoyi.domain.dss.sign.exception.dto.SignExceptionDTO;
  9 +import com.ruoyi.domain.dss.sign.exception.vo.SignExceptionVo;
  10 +import com.ruoyi.domain.scheduling.LinggangScheduling;
  11 +import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
  12 +import com.ruoyi.in.domain.SignIn;
  13 +import com.ruoyi.in.service.ISignInService;
  14 +import com.ruoyi.service.driver.NewDriverService;
  15 +import com.ruoyi.service.scheduling.LinggangSchedulingService;
  16 +import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
  17 +import com.ruoyi.system.service.ISysDictDataService;
  18 +import com.ruoyi.utils.DateUtil;
  19 +import io.swagger.annotations.Api;
  20 +import io.swagger.annotations.ApiOperation;
  21 +import lombok.extern.slf4j.Slf4j;
  22 +import org.apache.commons.collections4.CollectionUtils;
  23 +import org.apache.commons.lang3.time.DateUtils;
  24 +import org.springframework.beans.factory.annotation.Autowired;
  25 +import org.springframework.web.bind.annotation.PostMapping;
  26 +import org.springframework.web.bind.annotation.RequestBody;
  27 +import org.springframework.web.bind.annotation.RequestMapping;
  28 +import org.springframework.web.bind.annotation.RestController;
  29 +
  30 +import java.math.BigDecimal;
  31 +import java.util.*;
  32 +import java.util.stream.Collectors;
  33 +
  34 +/**
  35 + * @author liujun
  36 + * @date 2024年08月20日 10:44
  37 + */
  38 +@Slf4j
  39 +@RestController
  40 +@RequestMapping("/app")
  41 +@Api(tags = "【App对接】打卡异常")
  42 +public class AppSignExceptionController extends BaseController {
  43 + @Autowired
  44 + private NewDriverService driverService;
  45 + @Autowired
  46 + private LinggangSchedulingService schedulingService;
  47 +
  48 + @Autowired
  49 + private EquipmentExceptionReportService equipmentExceptionReportService;
  50 + @Autowired
  51 + private ISignInService signInService;
  52 + @Autowired
  53 + private ISysDictDataService dictDataService;
  54 +
  55 + @ApiOperation("酒测签到异常")
  56 + @PostMapping("/sign/exception/list")
  57 + public ResponseResult<List<SignExceptionVo>> list(@RequestBody SignExceptionDTO dto) {
  58 +
  59 + SignIn signIn = new SignIn();
  60 + if (Objects.nonNull(dto.getSignTime())) {
  61 + signIn.setStartCreateTime(DateUtil.shortDate(dto.getSignTime()));
  62 + } else {
  63 + signIn.setStartCreateTime(DateUtil.shortDate(new Date()));
  64 + }
  65 +
  66 + signIn.setEndCreateTime(DateUtils.addDays(signIn.getStartCreateTime(), 1));
  67 + List<SignIn> signIns = signInService.list(signIn);
  68 + if (CollectionUtils.isEmpty(signIns)) {
  69 + log.info("signIns is null");
  70 + return ResponseResult.success();
  71 + }
  72 + long drunkenness = queryDrunkenness();
  73 + BigDecimal decimal = new BigDecimal(drunkenness);
  74 + signIns = signIns.stream().filter(s -> Objects.nonNull(s.getAlcoholIntake()) && s.getAlcoholIntake().compareTo(decimal) >= 0).collect(Collectors.toList());
  75 + if (CollectionUtils.isEmpty(signIns)) {
  76 + log.info("signIns filter after is null");
  77 + return ResponseResult.success();
  78 + }
  79 +
  80 + Set<Long> signInIds = signIns.stream().map(SignIn::getId).collect(Collectors.toSet());
  81 + if (CollectionUtils.isEmpty(signInIds)) {
  82 + log.info("signInIds is null");
  83 + return ResponseResult.success();
  84 + }
  85 +
  86 + Set<Long> schedulingIds = signIns.stream().map(SignIn::getSchedulingId).collect(Collectors.toSet());
  87 + List<LinggangScheduling> schedulings = schedulingService.list(null, schedulingIds);
  88 +
  89 + EquipmentExceptionReport report = new EquipmentExceptionReport();
  90 + report.setSignIds(signInIds);
  91 + report.setFleetName(dto.getFleetName());
  92 + report.setLineName(dto.getLineName());
  93 +
  94 + List<EquipmentExceptionReport> reportList = equipmentExceptionReportService.list(report);
  95 + if (CollectionUtils.isEmpty(reportList)) {
  96 + log.info("reportList is null");
  97 + return ResponseResult.success();
  98 + }
  99 +
  100 + Set<String> jobCodes = reportList.stream().map(EquipmentExceptionReport::getJobCode).collect(Collectors.toSet());
  101 + List<NewDriver> drivers = driverService.list(jobCodes);
  102 +
  103 + List<SignExceptionVo> vos = convertSignExceptionVo(reportList,drivers,signIns,schedulings);
  104 + return ResponseResult.success(vos);
  105 + }
  106 +
  107 + private long queryDrunkenness() {
  108 + SysDictData dictData = new SysDictData();
  109 + dictData.setDictType("drunkenness");
  110 + dictData.setDiscKey("drunkenness_key");
  111 + SysDictData sourceDic = dictDataService.getOne(dictData);
  112 + return Objects.isNull(sourceDic) || Objects.isNull(sourceDic.getDictValue()) ? 28L : Convert.toLong(sourceDic.getDictValue());
  113 + }
  114 +
  115 + private List<SignExceptionVo> convertSignExceptionVo(List<EquipmentExceptionReport> reportList, List<NewDriver> drivers, List<SignIn> signIns, List<LinggangScheduling> schedulings) {
  116 + int driverSize = CollectionUtils.size(drivers);
  117 + int schedulingSize = CollectionUtils.size(schedulings);
  118 +
  119 + return reportList.stream().map(r -> {
  120 + SignExceptionVo vo = new SignExceptionVo();
  121 + vo.setFleetName(r.getFleetName());
  122 + vo.setLineName(r.getLineName());
  123 +
  124 + Optional<SignIn> optSign = signIns.stream().filter(s -> Objects.equals(s.getId(), r.getSignId())).findFirst();
  125 + if (optSign.isPresent()) {
  126 + vo.setSignTime(optSign.get().getCreateTime());
  127 + vo.setSignStatus(optSign.get().getStatus());
  128 + vo.setAlcoholIntake(optSign.get().getAlcoholIntake());
  129 +
  130 + if (schedulingSize > 0) {
  131 + Optional<LinggangScheduling> scheOpt = schedulings.stream().filter(s -> Objects.equals(s.getId(), optSign.get().getSchedulingId())).findFirst();
  132 + if (scheOpt.isPresent()) {
  133 + vo.setNbbm(scheOpt.get().getNbbm());
  134 + }
  135 + }
  136 + }
  137 +
  138 + if (driverSize > 0) {
  139 + Optional<NewDriver> driverOpt = drivers.stream().filter(d -> Objects.equals(r.getJobCode(), d.getJobCode())).findFirst();
  140 + if (driverOpt.isPresent()) {
  141 + vo.setJobCode(driverOpt.get().getJobCode());
  142 + vo.setPersonnelName(driverOpt.get().getPersonnelName());
  143 + }
  144 + }
  145 +
  146 + return vo;
  147 + }).collect(Collectors.toList());
  148 + }
  149 +}
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/exception/dto/SignExceptionDTO.java 0 → 100644
  View file @8105bd4
  1 +package com.ruoyi.domain.dss.sign.exception.dto;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import io.swagger.annotations.ApiModel;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +import lombok.Data;
  7 +import lombok.EqualsAndHashCode;
  8 +import lombok.experimental.Accessors;
  9 +
  10 +/**
  11 + * @author liujun
  12 + * @date 2024年08月20日 10:28
  13 + */
  14 +@Data
  15 +@ApiModel(value = "打卡异常DTO")
  16 +@Accessors(chain = true)
  17 +@EqualsAndHashCode(callSuper = false)
  18 +public class SignExceptionDTO implements java.io.Serializable {
  19 +
  20 + private static final long serialVersionUID = -2590373503786094947L;
  21 +
  22 + @ApiModelProperty("车队名称")
  23 + private java.lang.String fleetName;
  24 +
  25 + /***线路名称*/
  26 + @ApiModelProperty(name = "线路名称")
  27 + private java.lang.String lineName;
  28 +
  29 + @ApiModelProperty(name = "打卡时间；格式为：yyyy-MM-dd")
  30 + @JsonFormat(pattern = "yyyy-MM-dd")
  31 + private java.util.Date signTime;
  32 +}
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/exception/vo/SignExceptionVo.java 0 → 100644
  View file @8105bd4
  1 +package com.ruoyi.domain.dss.sign.exception.vo;
  2 +
  3 +
  4 +import io.swagger.annotations.ApiModel;
  5 +import io.swagger.annotations.ApiModelProperty;
  6 +import lombok.AllArgsConstructor;
  7 +import lombok.Data;
  8 +import lombok.NoArgsConstructor;
  9 +import lombok.experimental.Accessors;
  10 +
  11 +import java.math.BigDecimal;
  12 +
  13 +/**
  14 + * @author liujun
  15 + * @date 2024年08月20日 10:33
  16 + */
  17 +@Data
  18 +@NoArgsConstructor
  19 +@AllArgsConstructor
  20 +@Accessors(chain = true)
  21 +@ApiModel(value = "打卡异常VO")
  22 +public class SignExceptionVo implements java.io.Serializable {
  23 +
  24 + private static final long serialVersionUID = -7619185913947847906L;
  25 + @ApiModelProperty("车队名称")
  26 + private java.lang.String fleetName;
  27 +
  28 + /***线路名称*/
  29 + @ApiModelProperty(name = "线路名称")
  30 + private java.lang.String lineName;
  31 + @ApiModelProperty(name = "打卡时间")
  32 + private java.util.Date signTime;
  33 + @ApiModelProperty(name = "车辆自编号")
  34 + private java.lang.String nbbm;
  35 + @ApiModelProperty(name = "员工工号")
  36 + private String jobCode;
  37 + @ApiModelProperty(name = "员工姓名")
  38 + private java.lang.String personnelName;
  39 + @ApiModelProperty(name = "酒测状态 签到结果0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
  40 + private int signStatus;
  41 + @ApiModelProperty("酒精摄入量 52.12")
  42 + private BigDecimal alcoholIntake;
  43 +}
... ...
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
  View file @8105bd4
... ... @@ -144,6 +144,8 @@ public class EquipmentExceptionReport {
144 144  
145 145 @TableField(exist = false)
146 146 private String content;
  147 + @TableField(exist = false)
  148 + private Collection<Long> signIds;
147 149  
148 150 @Override
149 151 public String toString() {
... ...
Bsth-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
  View file @8105bd4
... ... @@ -39,6 +39,8 @@ public interface ISignInService extends IService&lt;SignIn&gt; {
39 39 */
40 40 public List<SignInResponseVo> selectSignInList(SignInResponseVo signIn);
41 41  
  42 + List<SignIn> list(SignIn signIn);
  43 +
42 44 SignIn getLastOne(SignIn signIn);
43 45  
44 46 /**
... ...
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
  View file @8105bd4
... ... @@ -147,6 +147,19 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
147 147 }
148 148  
149 149 @Override
  150 + public List<SignIn> list(SignIn signIn) {
  151 + LambdaQueryWrapper<SignIn> wrapper = new LambdaQueryWrapper<>(signIn);
  152 + if (Objects.nonNull(signIn.getStartCreateTime()) && Objects.nonNull(signIn.getEndCreateTime())) {
  153 + wrapper.between(SignIn::getCreateTime, signIn.getStartCreateTime(), signIn.getEndCreateTime());
  154 + } else if (Objects.nonNull(signIn.getStartCreateTime())) {
  155 + wrapper.ge(SignIn::getCreateTime, signIn.getStartCreateTime());
  156 + } else if (Objects.nonNull(signIn.getEndCreateTime())) {
  157 + wrapper.le(SignIn::getCreateTime, signIn.getEndCreateTime());
  158 + }
  159 + return list(wrapper);
  160 + }
  161 +
  162 + @Override
150 163 public SignIn getLastOne(SignIn signIn) {
151 164 LambdaQueryWrapper<SignIn> wrapper = new LambdaQueryWrapper<>(signIn);
152 165 wrapper.orderByDesc(SignIn::getCreateTime);
... ... @@ -352,7 +365,7 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
352 365 throw new RuntimeException("只能对当前月的数据进行补签！");
353 366 }
354 367 if (CollectionUtil.isEmpty(dto)) {
355   - dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd", signIn.getCreateTime()), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(signIn.getCreateTime(),1)), null, driver.getJobCode(), null);
  368 + dto = schedulingMapper.queryToDay(ConstDateUtil.formatDate("yyyy-MM-dd", signIn.getCreateTime()), DateUtil.YYYY_MM_DD_LINK.format(org.apache.commons.lang3.time.DateUtils.addDays(signIn.getCreateTime(), 1)), null, driver.getJobCode(), null);
356 369 }
357 370 handleSignBody(signIn, driver, globalIndex, now, dto);
358 371 signIn.setUpdateBy(SecurityUtils.getUsername());
... ...
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
  View file @8105bd4
... ... @@ -9,9 +9,11 @@ import com.ruoyi.domain.OrderEntity;
9 9 import com.ruoyi.domain.scheduling.LinggangScheduling;
10 10 import com.ruoyi.mapper.scheduling.LinggangSchedulingMapper;
11 11 import com.ruoyi.service.scheduling.LinggangSchedulingService;
  12 +import org.apache.commons.collections4.CollectionUtils;
12 13 import org.springframework.beans.factory.annotation.Autowired;
13 14 import org.springframework.stereotype.Service;
14 15  
  16 +import java.util.Collection;
15 17 import java.util.Collections;
16 18 import java.util.List;
17 19 import java.util.Objects;
... ... @@ -29,14 +31,14 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
29 31 public IPage<LinggangScheduling> pageList(Page<LinggangScheduling> page, LinggangScheduling entity, OrderEntity orderEntity) {
30 32 LambdaQueryWrapper<LinggangScheduling> countWrapper = new LambdaQueryWrapper<>(entity);
31 33 countWrapper.select(LinggangScheduling::getId);
32   - switchScheduleDate(countWrapper,entity);
  34 + switchScheduleDate(countWrapper, entity);
33 35 int count = count(countWrapper);
34 36  
35 37 List<LinggangScheduling> lists = Collections.emptyList();
36 38 if (count > 0) {
37 39 PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
38 40 LambdaQueryWrapper<LinggangScheduling> selectWrapper = new LambdaQueryWrapper<>(entity);
39   - switchScheduleDate(selectWrapper,entity);
  41 + switchScheduleDate(selectWrapper, entity);
40 42 orderColumn(selectWrapper, orderEntity);
41 43 lists = list(selectWrapper);
42 44 }
... ... @@ -54,13 +56,29 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
54 56 @Override
55 57 public List<LinggangScheduling> list(LinggangScheduling entity) {
56 58 LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
57   - switchScheduleDate(wrapper,entity);
  59 + switchScheduleDate(wrapper, entity);
  60 + return list(wrapper);
  61 + }
  62 +
  63 + @Override
  64 + public List<LinggangScheduling> list(LinggangScheduling entity, Collection<Long> schedulingIds) {
  65 + LambdaQueryWrapper<LinggangScheduling> wrapper = null;
  66 + if (Objects.isNull(entity)) {
  67 + wrapper = new LambdaQueryWrapper<>();
  68 + } else {
  69 + wrapper = new LambdaQueryWrapper<>(entity);
  70 + }
  71 +
  72 + if (CollectionUtils.isNotEmpty(schedulingIds)) {
  73 + wrapper.in(LinggangScheduling::getId, schedulingIds);
  74 + }
  75 +
58 76 return list(wrapper);
59 77 }
60 78  
61 79 @Override
62 80 public List<LinggangScheduling> listByCZ(LinggangScheduling entity) {
63   - return linggangSchedulingMapper.listByCZ(entity);
  81 + return linggangSchedulingMapper.listByCZ(entity);
64 82 }
65 83 // @Override
66 84 // public List<LinggangScheduling> listOfSelect(LinggangScheduling entity) {
... ... @@ -88,7 +106,7 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
88 106 @Override
89 107 public Integer countId(LinggangScheduling entity) {
90 108 LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
91   - switchScheduleDate(wrapper,entity);
  109 + switchScheduleDate(wrapper, entity);
92 110 wrapper.select(LinggangScheduling::getId);
93 111 return count(wrapper);
94 112 }
... ... @@ -247,13 +265,13 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
247 265 }
248 266 }
249 267  
250   - private void switchScheduleDate(LambdaQueryWrapper<LinggangScheduling> wrapper,LinggangScheduling entity){
251   - if(Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())){
252   - wrapper.between(LinggangScheduling::getScheduleDate,entity.getStartScheduleDate(),entity.getEndScheduleDate());
253   - }else if(Objects.nonNull(entity.getStartScheduleDate())){
254   - wrapper.ge(LinggangScheduling::getScheduleDate,entity.getStartScheduleDate());
255   - }else if(Objects.nonNull(entity.getEndScheduleDate())){
256   - wrapper.le(LinggangScheduling::getScheduleDate,entity.getEndScheduleDate());
  268 + private void switchScheduleDate(LambdaQueryWrapper<LinggangScheduling> wrapper, LinggangScheduling entity) {
  269 + if (Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())) {
  270 + wrapper.between(LinggangScheduling::getScheduleDate, entity.getStartScheduleDate(), entity.getEndScheduleDate());
  271 + } else if (Objects.nonNull(entity.getStartScheduleDate())) {
  272 + wrapper.ge(LinggangScheduling::getScheduleDate, entity.getStartScheduleDate());
  273 + } else if (Objects.nonNull(entity.getEndScheduleDate())) {
  274 + wrapper.le(LinggangScheduling::getScheduleDate, entity.getEndScheduleDate());
257 275 }
258 276 }
259 277 }
260 278 \ No newline at end of file
... ...
Bsth-admin/src/main/java/com/ruoyi/service/scheduling/LinggangSchedulingService.java
  View file @8105bd4
... ... @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
5 5 import com.ruoyi.domain.OrderEntity;
6 6 import com.ruoyi.domain.scheduling.LinggangScheduling;
7 7  
  8 +import java.util.Collection;
8 9 import java.util.List;
9 10  
10 11  
... ... @@ -22,6 +23,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt;
22 23 */
23 24 List<LinggangScheduling> list(LinggangScheduling entity);
24 25  
  26 + List<LinggangScheduling> list(LinggangScheduling entity, Collection<Long> schedulingIds);
  27 +
25 28 List<LinggangScheduling> listByCZ(LinggangScheduling entity);
26 29  
27 30 // List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids);
... ...