优化导入数据

liujun001
1 parent 04f3b0e8
Showing 8 changed files with 275 additions and 13 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/app/AppSignExceptionController.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/exception/dto/SignExceptionDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/exception/vo/SignExceptionVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/exception/report/EquipmentExceptionReport.java
Bsth-admin/src/main/java/com/ruoyi/in/service/ISignInService.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/scheduling/LinggangSchedulingService.java
+package com.ruoyi.controller.app;
+
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.domain.dss.sign.exception.dto.SignExceptionDTO;
+import com.ruoyi.domain.dss.sign.exception.vo.SignExceptionVo;
+import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.domain.sign.in.exception.report.EquipmentExceptionReport;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
+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;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @author liujun
+ * @date 2024年08月20日 10:44
+ */
+@Slf4j
+@RestController
+@RequestMapping("/app")
+@Api(tags = "【App对接】打卡异常")
+public class AppSignExceptionController extends BaseController {
+    @Autowired
+    private NewDriverService driverService;
+    @Autowired
+    private LinggangSchedulingService schedulingService;
+
+    @Autowired
+    private EquipmentExceptionReportService equipmentExceptionReportService;
+    @Autowired
+    private ISignInService signInService;
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @ApiOperation("酒测签到异常")
+    @PostMapping("/sign/exception/list")
+    public ResponseResult<List<SignExceptionVo>> list(@RequestBody SignExceptionDTO dto) {
+
+        SignIn signIn = new SignIn();
+        if (Objects.nonNull(dto.getSignTime())) {
+            signIn.setStartCreateTime(DateUtil.shortDate(dto.getSignTime()));
+        } else {
+            signIn.setStartCreateTime(DateUtil.shortDate(new Date()));
+        }
+
+        signIn.setEndCreateTime(DateUtils.addDays(signIn.getStartCreateTime(), 1));
+        List<SignIn> signIns = signInService.list(signIn);
+        if (CollectionUtils.isEmpty(signIns)) {
+            log.info("signIns is null");
+            return ResponseResult.success();
+        }
+        long drunkenness = queryDrunkenness();
+        BigDecimal decimal = new BigDecimal(drunkenness);
+        signIns = signIns.stream().filter(s -> Objects.nonNull(s.getAlcoholIntake()) && s.getAlcoholIntake().compareTo(decimal) >= 0).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(signIns)) {
+            log.info("signIns filter after is null");
+            return ResponseResult.success();
+        }
+
+        Set<Long> signInIds = signIns.stream().map(SignIn::getId).collect(Collectors.toSet());
+        if (CollectionUtils.isEmpty(signInIds)) {
+            log.info("signInIds is null");
+            return ResponseResult.success();
+        }
+
+        Set<Long> schedulingIds = signIns.stream().map(SignIn::getSchedulingId).collect(Collectors.toSet());
+        List<LinggangScheduling> schedulings = schedulingService.list(null, schedulingIds);
+
+        EquipmentExceptionReport report = new EquipmentExceptionReport();
+        report.setSignIds(signInIds);
+        report.setFleetName(dto.getFleetName());
+        report.setLineName(dto.getLineName());
+
+        List<EquipmentExceptionReport> reportList = equipmentExceptionReportService.list(report);
+        if (CollectionUtils.isEmpty(reportList)) {
+            log.info("reportList is null");
+            return ResponseResult.success();
+        }
+
+        Set<String> jobCodes = reportList.stream().map(EquipmentExceptionReport::getJobCode).collect(Collectors.toSet());
+        List<NewDriver> drivers = driverService.list(jobCodes);
+
+        List<SignExceptionVo> vos = convertSignExceptionVo(reportList,drivers,signIns,schedulings);
+        return ResponseResult.success(vos);
+    }
+
+    private long queryDrunkenness() {
+        SysDictData dictData = new SysDictData();
+        dictData.setDictType("drunkenness");
+        dictData.setDiscKey("drunkenness_key");
+        SysDictData sourceDic = dictDataService.getOne(dictData);
+        return Objects.isNull(sourceDic) || Objects.isNull(sourceDic.getDictValue()) ? 28L : Convert.toLong(sourceDic.getDictValue());
+    }
+
+    private List<SignExceptionVo> convertSignExceptionVo(List<EquipmentExceptionReport> reportList, List<NewDriver> drivers, List<SignIn> signIns, List<LinggangScheduling> schedulings) {
+        int driverSize = CollectionUtils.size(drivers);
+        int schedulingSize = CollectionUtils.size(schedulings);
+
+        return reportList.stream().map(r -> {
+            SignExceptionVo vo = new SignExceptionVo();
+            vo.setFleetName(r.getFleetName());
+            vo.setLineName(r.getLineName());
+
+            Optional<SignIn> optSign = signIns.stream().filter(s -> Objects.equals(s.getId(), r.getSignId())).findFirst();
+            if (optSign.isPresent()) {
+                vo.setSignTime(optSign.get().getCreateTime());
+                vo.setSignStatus(optSign.get().getStatus());
+                vo.setAlcoholIntake(optSign.get().getAlcoholIntake());
+
+                if (schedulingSize > 0) {
+                    Optional<LinggangScheduling> scheOpt = schedulings.stream().filter(s -> Objects.equals(s.getId(), optSign.get().getSchedulingId())).findFirst();
+                    if (scheOpt.isPresent()) {
+                        vo.setNbbm(scheOpt.get().getNbbm());
+                    }
+                }
+            }
+
+            if (driverSize > 0) {
+                Optional<NewDriver> driverOpt = drivers.stream().filter(d -> Objects.equals(r.getJobCode(), d.getJobCode())).findFirst();
+                if (driverOpt.isPresent()) {
+                    vo.setJobCode(driverOpt.get().getJobCode());
+                    vo.setPersonnelName(driverOpt.get().getPersonnelName());
+                }
+            }
+
+            return vo;
+        }).collect(Collectors.toList());
+    }
+}
+package com.ruoyi.domain.dss.sign.exception.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年08月20日 10:28
+ */
+@Data
+@ApiModel(value = "打卡异常DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class SignExceptionDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = -2590373503786094947L;
+
+    @ApiModelProperty("车队名称")
+    private java.lang.String fleetName;
+
+    /***线路名称*/
+    @ApiModelProperty(name = "线路名称")
+    private java.lang.String lineName;
+
+    @ApiModelProperty(name = "打卡时间；格式为：yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private java.util.Date signTime;
+}
+package com.ruoyi.domain.dss.sign.exception.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liujun
+ * @date 2024年08月20日 10:33
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "打卡异常VO")
+public class SignExceptionVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = -7619185913947847906L;
+    @ApiModelProperty("车队名称")
+    private java.lang.String fleetName;
+
+    /***线路名称*/
+    @ApiModelProperty(name = "线路名称")
+    private java.lang.String lineName;
+    @ApiModelProperty(name = "打卡时间")
+    private java.util.Date signTime;
+    @ApiModelProperty(name = "车辆自编号")
+    private java.lang.String nbbm;
+    @ApiModelProperty(name = "员工工号")
+    private String jobCode;
+    @ApiModelProperty(name = "员工姓名")
+    private java.lang.String personnelName;
+    @ApiModelProperty(name = "酒测状态 签到结果0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,44饮酒")
+    private int signStatus;
+    @ApiModelProperty("酒精摄入量 52.12")
+    private BigDecimal alcoholIntake;
+}
@@ -144,6 +144,8 @@ public class EquipmentExceptionReport {
     @TableField(exist = false)
     private String content;
+    @TableField(exist = false)
+    private Collection<Long> signIds;
     @Override
     public String toString() {
@@ -39,6 +39,8 @@ public interface ISignInService extends IService&lt;SignIn&gt; {
      */
     public List<SignInResponseVo> selectSignInList(SignInResponseVo signIn);
+    List<SignIn> list(SignIn signIn);
+
     SignIn getLastOne(SignIn signIn);
     /**
@@ -147,6 +147,19 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
     }
     @Override
+    public List<SignIn> list(SignIn signIn) {
+        LambdaQueryWrapper<SignIn> wrapper = new LambdaQueryWrapper<>(signIn);
+        if (Objects.nonNull(signIn.getStartCreateTime()) && Objects.nonNull(signIn.getEndCreateTime())) {
+            wrapper.between(SignIn::getCreateTime, signIn.getStartCreateTime(), signIn.getEndCreateTime());
+        } else if (Objects.nonNull(signIn.getStartCreateTime())) {
+            wrapper.ge(SignIn::getCreateTime, signIn.getStartCreateTime());
+        } else if (Objects.nonNull(signIn.getEndCreateTime())) {
+            wrapper.le(SignIn::getCreateTime, signIn.getEndCreateTime());
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public SignIn getLastOne(SignIn signIn) {
         LambdaQueryWrapper<SignIn> wrapper = new LambdaQueryWrapper<>(signIn);
         wrapper.orderByDesc(SignIn::getCreateTime);
@@ -352,7 +365,7 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
             throw new RuntimeException("只能对当前月的数据进行补签！");
         }
         if (CollectionUtil.isEmpty(dto)) {
-            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);
+            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);
         }
         handleSignBody(signIn, driver, globalIndex, now, dto);
         signIn.setUpdateBy(SecurityUtils.getUsername());
@@ -9,9 +9,11 @@ import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.mapper.scheduling.LinggangSchedulingMapper;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -29,14 +31,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);
+        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);
+            switchScheduleDate(selectWrapper, entity);
             orderColumn(selectWrapper, orderEntity);
             lists = list(selectWrapper);
         }
@@ -54,13 +56,29 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     @Override
     public List<LinggangScheduling> list(LinggangScheduling entity) {
         LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
-        switchScheduleDate(wrapper,entity);
+        switchScheduleDate(wrapper, entity);
+        return list(wrapper);
+    }
+
+    @Override
+    public List<LinggangScheduling> list(LinggangScheduling entity, Collection<Long> schedulingIds) {
+        LambdaQueryWrapper<LinggangScheduling> wrapper = null;
+        if (Objects.isNull(entity)) {
+            wrapper = new LambdaQueryWrapper<>();
+        } else {
+            wrapper = new LambdaQueryWrapper<>(entity);
+        }
+
+        if (CollectionUtils.isNotEmpty(schedulingIds)) {
+            wrapper.in(LinggangScheduling::getId, schedulingIds);
+        }
+
         return list(wrapper);
     }
     @Override
     public List<LinggangScheduling> listByCZ(LinggangScheduling entity) {
-      return linggangSchedulingMapper.listByCZ(entity);
+        return linggangSchedulingMapper.listByCZ(entity);
     }
     // @Override
     // public List<LinggangScheduling> listOfSelect(LinggangScheduling entity) {
@@ -88,7 +106,7 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     @Override
     public Integer countId(LinggangScheduling entity) {
         LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
-        switchScheduleDate(wrapper,entity);
+        switchScheduleDate(wrapper, entity);
         wrapper.select(LinggangScheduling::getId);
         return count(wrapper);
     }
@@ -247,13 +265,13 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
         }
     }
-    private void switchScheduleDate(LambdaQueryWrapper<LinggangScheduling> wrapper,LinggangScheduling entity){
-        if(Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())){
-            wrapper.between(LinggangScheduling::getScheduleDate,entity.getStartScheduleDate(),entity.getEndScheduleDate());
-        }else if(Objects.nonNull(entity.getStartScheduleDate())){
-            wrapper.ge(LinggangScheduling::getScheduleDate,entity.getStartScheduleDate());
-        }else if(Objects.nonNull(entity.getEndScheduleDate())){
-            wrapper.le(LinggangScheduling::getScheduleDate,entity.getEndScheduleDate());
+    private void switchScheduleDate(LambdaQueryWrapper<LinggangScheduling> wrapper, LinggangScheduling entity) {
+        if (Objects.nonNull(entity.getStartScheduleDate()) && Objects.nonNull(entity.getEndScheduleDate())) {
+            wrapper.between(LinggangScheduling::getScheduleDate, entity.getStartScheduleDate(), entity.getEndScheduleDate());
+        } else if (Objects.nonNull(entity.getStartScheduleDate())) {
+            wrapper.ge(LinggangScheduling::getScheduleDate, entity.getStartScheduleDate());
+        } else if (Objects.nonNull(entity.getEndScheduleDate())) {
+            wrapper.le(LinggangScheduling::getScheduleDate, entity.getEndScheduleDate());
         }
     }
 }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
+import java.util.Collection;
 import java.util.List;
@@ -22,6 +23,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
      */
     List<LinggangScheduling> list(LinggangScheduling entity);
+    List<LinggangScheduling> list(LinggangScheduling entity, Collection<Long> schedulingIds);
+
     List<LinggangScheduling> listByCZ(LinggangScheduling entity);
     // List<LinggangScheduling> listOfIds(java.util.Collection<java.lang.Integer> ids);