优化签到和日志

liujun001
1 parent fdb152ac
Showing 27 changed files with 925 additions and 178 deletions
Bsth-admin/src/main/java/com/ruoyi/domain/DriverScheduling.java
Bsth-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
Bsth-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/mapper/SignInMapperV1.java
Bsth-admin/src/main/java/com/ruoyi/in/service/SignInServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/bigViewVo/FleetState.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/bigViewVo/LineInfo.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/mapper/SchedulingMapperV1.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/SchedulingServiceV1.java
Bsth-admin/src/main/java/com/ruoyi/scheduling/service/impl/SchedulingServiceV1Impl.java
Bsth-admin/src/main/java/com/ruoyi/service/SchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/BigViewServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/template/domain/FleetLineTemplate.java
Bsth-admin/src/main/java/com/ruoyi/template/service/IFleetLineTemplateService.java
Bsth-admin/src/main/java/com/ruoyi/template/service/impl/FleetLineTemplateServiceImpl.java
Bsth-admin/src/main/resources/application-druid-dev.yml
 package com.ruoyi.domain;
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -27,12 +27,17 @@ public class DriverScheduling {
     private Integer alcoholFlag;
     private BigDecimal alcoholIntake;
     private String remark;
+    @TableField(exist = false)
     private String siteName;
     /**
      * 不是当前表的属性
      */
+    @TableField(exist = false)
     private String fleetName;
+    @TableField(exist = false)
+    private long minTime;
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);
 package com.ruoyi.driver.domain;
+import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -159,6 +160,11 @@ public class Driver extends BaseEntity implements Serializable {
     }
     @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+
+    @Override
     public int hashCode() {
         return new HashCodeBuilder(17, 37).append(getId()).append(getJobCode()).append(getCompanyCode()).append(getBrancheCompanyCode()).append(getPersonnelName()).append(getPapersCode()).append(getIcCardCode()).append(getPersonnelType()).append(getPosts()).append(getCard()).append(getTelphone()).append(getIcRfid()).append(getIdRfid()).append(getTagRfid()).append(getLineName()).append(getLineCode()).append(getFaceSignIn()).append(getImage()).append(getUpdateTime()).append(getSignInEquipment()).append(getFleetName()).toHashCode();
     }
 package com.ruoyi.in.controller;
-import java.io.IOException;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.in.service.SignInServiceV1;
 import com.ruoyi.pojo.response.SignInResponseVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.in.service.ISignInService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 /**
  * 签到Controller
@@ -35,12 +31,16 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author guzijian
  * @date 2023-07-05
  */
+@Slf4j
 @RestController
 @RequestMapping("/in/in")
 @Api(tags = "签到管理")
 public class SignInController extends BaseController {
     @Autowired
     private ISignInService signInService;
+    @Autowired
+    private SignInServiceV1 signInServiceV1;
+
     /**
      * 查询签到列表
@@ -99,7 +99,14 @@ public class SignInController extends BaseController {
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
     public AjaxResult addSignIn(@ApiParam @RequestBody @Validated SignIn signIn) throws FileUploadException, IOException {
-        return signInService.addSignIn(signIn);
+        Integer num = RandomUtils.nextInt(0, 9);
+        if (num < 3) {
+            log.info("[{}] sing method 走新的签到方式 :[{}] ", num, signIn);
+            return signInServiceV1.addsignInV1(signIn);
+        } else {
+            log.info("[{}] sing method  old sign :[{}]", num, signIn);
+            return signInService.addSignIn(signIn);
+        }
     }
 //    /**
@@ -123,14 +130,13 @@ public class SignInController extends BaseController {
 //    public AjaxResult remove(@PathVariable Long[] ids) {
 //        return toAjax(signInService.deleteSignInByIds(ids));
 //    }
-
     @GetMapping("/repair")
-    public AjaxResult repairSignRecord(HttpServletRequest request){
+    public AjaxResult repairSignRecord(HttpServletRequest request) {
         return AjaxResult.success(signInService.repairSignRecord(request));
     }
     @GetMapping("/repairAll/{date}")
-    public AjaxResult repairAllSignRecord(HttpServletRequest request,@PathVariable("date") String date){
-        return AjaxResult.success(signInService.repairAllSignRecord(request,date));
+    public AjaxResult repairAllSignRecord(HttpServletRequest request, @PathVariable("date") String date) {
+        return AjaxResult.success(signInService.repairAllSignRecord(request, date));
     }
 }
 package com.ruoyi.in.domain;
-import java.io.UnsupportedEncodingException;
-import java.math.BigDecimal;
-
 import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 /**
  * 签到对象 sign_in
@@ -96,13 +92,17 @@ public class SignIn extends BaseEntity {
     @Excel(name = "酒精摄入量")
     @ApiModelProperty("酒精摄入量 52.12")
     private BigDecimal alcoholIntake;
-    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常")
+    @Excel(name = "异常类型",readConverterExp = "0=无异常,1=超时异常,2=无排班异常,3=酒精超标异常,200=早签,300=迟到")
     @ApiModelProperty("异常类型")
     private Integer exType;
     @Override
     public String toString() {
-        return JSON.toJSONString(this);
+        String image = this.getImage();
+        this.setImage(null);
+        String str = JSON.toJSONString(this);
+        this.setImage(image);
+        return str;
     }
 }
+package com.ruoyi.in.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.in.domain.SignInV1;
+
+import javax.annotation.Resource;
+
+@Resource
+public interface SignInMapperV1 extends BaseMapper<SignInV1> {
+}
+package com.ruoyi.in.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.domain.SignInV1;
+
+import java.io.IOException;
+
+public interface SignInServiceV1 extends IService<SignInV1> {
+    AjaxResult addsignInV1(SignIn signIn) throws IOException;
+}
@@ -38,6 +38,7 @@ import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.service.SchedulingService;
 import com.ruoyi.service.ThreadJobService;
 import com.ruoyi.utils.ConstDateUtil;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -170,9 +171,16 @@ public class SignInServiceImpl implements ISignInService {
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
         handleSignBody(signIn, driver, globalIndex, now, dto);
-        log.info("签到签退数据为：[{}]",dto.get(globalIndex.getIndex()));
-        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
+        if (CollectionUtils.isNotEmpty(dto)) {
+            int size = CollectionUtils.size(dto);
+            if (size > 0 && globalIndex.getIndex() < size) {
+                log.info("签到签退数据为：[{}]", dto.get(globalIndex.getIndex()));
+            }
+        } else {
+            log.info("没有签到或签退的数据");
+        }
+        if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && CollectionUtils.isNotEmpty(dto) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
                 String msg = "签到异常: 请使用手持式酒精测试棒进行酒测";
+package com.ruoyi.in.service.impl;
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.ConstDriverProperties;
+import com.ruoyi.common.ConstSignInConstSignInProperties;
+import com.ruoyi.common.ErrorTypeProperties;
+import com.ruoyi.common.cache.TempCache;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.redispre.GlobalRedisPreName;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
+import com.ruoyi.common.utils.uuid.Seq;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.DriverSchedulingV1;
+import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.driver.mapper.DriverMapper;
+import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.equipment.mapper.EquipmentMapper;
+import com.ruoyi.in.domain.CalDriverScheduling;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.domain.SignInV1;
+import com.ruoyi.in.mapper.SignInMapper;
+import com.ruoyi.in.mapper.SignInMapperV1;
+import com.ruoyi.in.service.SignInServiceV1;
+import com.ruoyi.scheduling.service.SchedulingServiceV1;
+import com.ruoyi.service.BigViewServiceV1;
+import com.ruoyi.service.SchedulingService;
+import com.ruoyi.service.ThreadJobService;
+import com.ruoyi.utils.ConstDateUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.ruoyi.common.ConstSignInConstSignInProperties.*;
+import static com.ruoyi.common.ErrorTypeProperties.SIGN_IN_ERROR;
+import static com.ruoyi.common.ErrorTypeProperties.SIGN_OUT_ERROR;
+
+@Slf4j
+@Service
+public class SignInServiceV1Impl extends ServiceImpl<SignInMapperV1, SignInV1> implements SignInServiceV1 {
+
+    @Autowired
+    private DriverMapper driverMapper;
+    @Autowired
+    private EquipmentMapper equipmentMapper;
+    @Autowired
+    private SchedulingServiceV1 schedulingServiceV1;
+
+    @Resource
+    private ThreadJobService threadJobService;
+    @Resource
+    private SchedulingService schedulingService;
+    @Resource
+    private BigViewServiceV1 bigViewServiceV1;
+
+    @Autowired
+    private SignInMapper signInMapper;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    private static final FastDateFormat HHMM = FastDateFormat.getInstance("HH:mm");
+
+    @Override
+    public AjaxResult addsignInV1(SignIn signIn) throws IOException {
+
+        SignInV1 signInV1 = new SignInV1();
+
+        // 查询员工信息
+        Driver driver = driverMapper.getDriverInfoByJobCode(signIn.getJobCode());
+        if (Objects.isNull(driver)) {
+            log.info("这个工号的员工不存在:[{}]", signIn);
+            return AjaxResult.warn("这个工号的员工不存在！");
+        }
+
+        Equipment equipment = equipmentMapper.selectEquipmentByDeviceId(signIn.getDeviceId());
+        if (Objects.isNull(equipment)) {
+            log.info("这个设备号不存在:[{}]", signIn);
+            return AjaxResult.warn("这个设备号不存在");
+        }
+
+        signInV1.setAddress(equipment.getAddress());
+        signInV1.setDeviceId(signIn.getDeviceId());
+        signInV1.setSiteName(equipment.getSiteName());
+        signInV1.setName(driver.getPersonnelName());
+        signInV1.setPosts(driver.getPosts());
+
+        if (Objects.isNull(signIn.getCreateTime())) {
+            signIn.setCreateTime(DateUtils.getNowDate());
+        }
+        long dateTime = signIn.getCreateTime().getTime();
+        Date date = DateUtils.shortDate(new Date(dateTime));
+        DriverScheduling scheduling = null;
+        CalDriverScheduling calDriverScheduling = null;
+
+        uploadImage(signIn);
+        List<DriverSchedulingV1> schedulings = schedulingServiceV1.queryByJobCodeAndSchedulingDate(signIn.getJobCode(), date);
+        if (CollectionUtils.isEmpty(schedulings)) {
+            saveSignOfNoScheduling(signIn, ErrorTypeProperties.WORK_DAY_ERROR);
+            switchAndChooseAlcohol(signIn, driver, null);
+            return saveData(signIn, null, null, driver, signInV1);
+        } else if (Objects.equals(2, signIn.getType())) {
+            calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_IN);
+        } else {
+            if (checkAlcoholIntake(signIn.getAlcoholIntake())) {
+                AjaxResult ajaxResult = bigViewServiceV1.getAjaxResultByDriverSignInfo(signIn);
+                if (Objects.nonNull(ajaxResult)) {
+                    return ajaxResult;
+                }
+            }
+            calDriverScheduling = findSchedulingByDateTime(schedulings, dateTime, ConstDriverProperties.BC_TYPE_OUT);
+        }
+
+        if (Objects.isNull(calDriverScheduling.getDriverScheduling())) {
+            log.info("当天没有满足要求的数据:dateTime:[{}],signIn:[{}],scheduling:[{}]", dateTime, signIn, JSON.toJSONString(scheduling));
+            saveSignOfNoScheduling(signIn, ErrorTypeProperties.WORK_DAY_ERROR);
+            return AjaxResult.success(ErrorTypeProperties.WORK_DAY_ERROR);
+        }
+
+        scheduling = calDriverScheduling.getDriverScheduling();
+
+        if (Objects.isNull(scheduling.getSignInId())) {
+            switchAndChooseTime(signIn, scheduling, dateTime);
+            switchAndChooseAlcohol(signIn, driver, scheduling);
+
+        } else {
+            SignInV1 sourceSign = getById(scheduling.getSignInId());
+            if (Objects.nonNull(sourceSign)) {
+                switchAndChooseTime(signIn, scheduling, dateTime);
+                switchAndChooseAlcohol(signIn, driver, scheduling);
+            }
+        }
+        return saveData(signIn, scheduling, calDriverScheduling, driver, signInV1);
+    }
+
+    private AjaxResult saveData(SignIn signIn, DriverScheduling scheduling, CalDriverScheduling calDriverScheduling, Driver driver, SignInV1 signInV1) {
+        signInMapper.insertSignIn(signIn);
+        // 更新考勤
+        if (Objects.nonNull(calDriverScheduling)) {
+            schedulingService.computedSignInBySignIn(scheduling, calDriverScheduling.getIndex(), signIn);
+        }
+
+        if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
+            TempCache.updateSignStatus(signIn.getJobCode());
+        }
+
+        // 异常保存到异常异常中
+        threadJobService.asyncInsertExceptionRecord(signIn, driver, scheduling);
+
+        return handleAjaxResult(signIn, signInV1);
+    }
+
+
+    private AjaxResult handleAjaxResult(SignIn signIn, SignInV1 signInV1) {
+
+        // 酒精测试后续恢复的需要删除异常的酒测缓存
+        BeanUtils.copyProperties(signIn, signInV1);
+        if (SIGN_IN_SUCCESS.equals(signIn.getStatus())) {
+            String prompt = signIn.getRemark().replace("正常", "");
+            if (signIn.getType().equals(SIGN_OUT)) {
+                return AjaxResult.success(SIGN_OUT_SUCCESS_STRING + "," + prompt, signInV1);
+            } else {
+                return AjaxResult.success(SIGN_IN_SUCCESS_STRING + "," + prompt, signInV1);
+            }
+        } else {
+            if (signIn.getType().equals(SIGN_OUT)) {
+                return AjaxResult.success(SIGN_OUT_ERROR + ":" + signIn.getRemark(), signInV1);
+            }
+            return AjaxResult.success(SIGN_IN_ERROR + ":" + signIn.getRemark(), signInV1);
+        }
+    }
+
+
+    /***
+     *  判断是否酒驾；范围 0 =未做酒测；1=酒测；2=酒测正常
+     * @author liujun
+     * @date 2024/9/23 10:56
+     *
+     * @param signIn
+     * @param driver
+     * @param scheduling
+     * @return java.lang.Integer
+     */
+    private Integer switchAndChooseAlcohol(SignIn signIn, Driver driver, DriverScheduling scheduling) {
+        // 酒精测试校验 确定 且员工工种是驾驶员
+        if (ConstSignInConstSignInProperties.ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && ConstDriverProperties.PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
+            if (org.apache.commons.lang3.StringUtils.isEmpty(signIn.getIp())) {
+                signIn.setIp(IpUtils.getIpAddr());
+            }
+            Integer extype = Objects.isNull(signIn.getExType()) ? 0 : signIn.getExType();
+            if (checkAlcoholIntake(signIn.getAlcoholIntake())) {
+                threadJobService.asyncSendEmail(scheduling, signIn, driver);
+                signIn.setRemark(join(signIn.getRemark(), ErrorTypeProperties.ALCOHOL_SIGN_IN_ERROR, signIn.getAlcoholIntake().toString(), "mg/100ml。"));
+                signIn.setExType(extype + ConstSignInConstSignInProperties.SIGN_ALCOHOL_EX_NUM);
+
+                signIn.setStatus(ConstSignInConstSignInProperties.SIGN_IN_FAIL);
+                signIn.setRemark(signIn.getRemark().replaceFirst(",$", "。"));
+
+                return 1;
+            } else {
+                // 如果驾驶员酒精测试在之前不合格 必须重测
+                String key = GlobalRedisPreName.REDIS_SIGN_IN_DRIVER_ALCOHOL_OVERFLOW + ConstDateUtil.formatDate("yyyyMMdd") + ":" + driver.getJobCode();
+                Integer count = redisCache.getCacheObject(key);
+                if (!Objects.isNull(count)) {
+                    redisCache.deleteObject(key);
+                }
+                if (Objects.isNull(signIn.getStatus()) || Objects.equals(signIn.getStatus(), ConstSignInConstSignInProperties.SIGN_IN_SUCCESS)) {
+                    signIn.setStatus(ConstSignInConstSignInProperties.SIGN_IN_SUCCESS);
+                }
+                extype = extype > 9 ? extype : extype + ConstSignInConstSignInProperties.SIGN_NO_EX_NUM;
+                signIn.setExType(extype);
+                if (Objects.equals(0, signIn.getExType())) {
+                    signIn.setRemark("正常");
+                }
+
+
+                return 2;
+            }
+        }
+        log.info("未做酒测：alcoholFlag[{}];posts:[{}]", signIn.getAlcoholFlag(), driver.getPosts());
+        return 0;
+    }
+
+    private boolean checkAlcoholIntake(BigDecimal alcoholIntake) {
+        return Objects.nonNull(alcoholIntake) ? new BigDecimal("20").compareTo(alcoholIntake) <= 0 : Boolean.FALSE;
+    }
+
+    private int switchAndChooseTime(SignIn signIn, DriverScheduling scheduling, long dateTime) {
+        if (Objects.equals(2, signIn.getType())) {
+            Date zdsj = new Date(scheduling.getZdsjT());
+
+            Date date1 = org.apache.commons.lang3.time.DateUtils.addMinutes(zdsj, 80);
+            String fcsjHHMM = HHMM.format(zdsj);
+            String dzsjHHMM = HHMM.format(date1);
+
+            String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_OUT_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
+            return switchAndChooseTime(signIn, dateTime, zdsj, 80, remark);
+        } else {
+            Date fcsj = new Date(scheduling.getFcsjT());
+
+            String fcsjHHMM = HHMM.format(org.apache.commons.lang3.time.DateUtils.addMinutes(fcsj, -60));
+            String dzsjHHMM = HHMM.format(fcsj);
+
+            String remark = org.apache.commons.lang3.StringUtils.join(ErrorTypeProperties.SIGN_IN_TIMEOUT, "请在", fcsjHHMM, "到", dzsjHHMM, "之间打卡");
+            return switchAndChooseTime(signIn, dateTime, fcsj, -60, remark);
+        }
+    }
+
+    private String join(String... strs) {
+        int length = strs.length;
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < length; i++) {
+            if (org.apache.commons.lang3.StringUtils.isNotEmpty(strs[i])) {
+                if (org.apache.commons.lang3.StringUtils.isNotEmpty(builder.toString())) {
+                    builder.append(";");
+                }
+                builder.append(strs[i]);
+            }
+        }
+        return builder.toString();
+    }
+
+    /**
+     * 判断时间是否是早签、正常、迟到
+     *
+     * @param signIn   签到数据
+     * @param dateTime 打卡时间
+     * @param date     发车或到站时间
+     * @param value    允许的最大范围值
+     * @param remark   提示信息模板
+     * @author liujun
+     * @date 2024/9/20 17:14
+     */
+    private int switchAndChooseTime(SignIn signIn, long dateTime, Date date, Integer value, String remark) {
+        long time1 = date.getTime();
+        date = org.apache.commons.lang3.time.DateUtils.addMinutes(date, value);
+        long time = date.getTime();
+
+        if (value < 0) {
+            if (dateTime < time) {
+                signIn.setExType(20);
+                signIn.setRemark(remark);
+                signIn.setStatus(2);
+
+                return 1;
+            } else if (dateTime > time1) {
+                signIn.setExType(30);
+                signIn.setRemark(remark);
+                signIn.setStatus(2);
+
+                return 2;
+            }
+        } else if (value > 0) {
+            if (dateTime < time1) {
+                signIn.setExType(20);
+                signIn.setRemark(remark);
+                signIn.setStatus(2);
+
+                return 1;
+            } else if (dateTime > time) {
+                signIn.setExType(30);
+                signIn.setRemark(remark);
+                signIn.setStatus(2);
+
+                return 2;
+            }
+        }
+
+        signIn.setExType(0);
+        signIn.setStatus(1);
+
+        return 0;
+    }
+
+    /***
+     *  在数据中找出最近一条的排班数据
+     * @author liujun
+     * @date 2024/9/20 17:08
+     * @param schedulings 排班数据集合
+     * @param dateTime 打开时间
+     * @param type  签到类型
+     * @return com.ruoyi.domain.DriverScheduling
+     */
+    private CalDriverScheduling findSchedulingByDateTime(List<DriverSchedulingV1> schedulings, long dateTime, String type) {
+
+        AtomicInteger atomicInteger = new AtomicInteger(-1);
+        Optional<DriverSchedulingV1> optional = schedulings.stream().map(s -> {
+            atomicInteger.addAndGet(1);
+            if (Objects.nonNull(s.getFcsjT()) && org.apache.commons.lang3.StringUtils.equalsAnyIgnoreCase(org.apache.commons.lang3.StringUtils.trim(s.getBcType()), type)) {
+                s.setMinTime(Math.abs(s.getFcsjT() - dateTime));
+            } else {
+                s.setMinTime(Long.MAX_VALUE);
+            }
+            return s;
+        }).min(Comparator.comparing(DriverScheduling::getMinTime));
+        return new CalDriverScheduling(atomicInteger.get(), optional.orElse(null));
+    }
+
+    /**
+     * 没有排班数据
+     *
+     * @param signIn
+     * @param remark
+     * @author liujun
+     * @date 2024/9/20 16:41
+     */
+    private void saveSignOfNoScheduling(SignIn signIn, String remark) {
+        signIn.setRemark(remark);
+        signIn.setExType(2);
+        signIn.setStatus(2);
+        signIn.setType(1);
+
+    }
+
+    private void uploadImage(SignIn signIn) throws IOException {
+        String base64 = signIn.getImage();
+        // 图片路径
+        String filePath = RuoYiConfig.getUploadPath();
+        // 固定jpg文件
+        String fileName = "";
+        // 看是否带有base64前缀 有就判断文件类型 没有默认jpg
+        fileName = checkImageBase64Format(signIn.getImage());
+        fileName = extractFilename(fileName);
+        // 获取相对路径
+        String absPath = getAbsoluteFile(filePath, fileName).getAbsolutePath();
+
+        // 获取文件上传路径
+        String pathFileName = getPathFileName(filePath, fileName);
+        signIn.setImage(pathFileName);
+        signIn.setImage(signIn.getImage());
+        log.info("开始异步上传签到图片");
+        // 异步上传文件
+        threadJobService.asyncStartUploadBase64Image(absPath, base64);
+    }
+
+    /**
+     * 检查文件类型
+     *
+     * @param base64ImgData
+     * @return
+     */
+    public static String checkImageBase64Format(String base64ImgData) {
+        byte[] b = Base64.getDecoder().decode(base64ImgData);
+        String type = "";
+        if (0x424D == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
+            type = "bmp";
+        } else if (0x8950 == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
+            type = "png";
+        } else {
+            type = "jpg";
+        }
+//        else if (0xFFD8 == ((b[0] & 0xff) << 8 | (b[1] & 0xff))) {
+//            type = "jpg";
+//        }
+        return type;
+    }
+
+    /**
+     * 获取扩展文件名
+     *
+     * @param extendFileName
+     * @return
+     */
+    private String extractFilename(String extendFileName) {
+        return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
+                FilenameUtils.getBaseName(UUID.randomUUID().toString().replace("-", "")), Seq.getId(Seq.uploadSeqType), extendFileName);
+    }
+
+    /**
+     * 获取相对路径名
+     *
+     * @param uploadDir
+     * @param fileName
+     * @return
+     * @throws IOException
+     */
+    private File getAbsoluteFile(String uploadDir, String fileName) throws IOException {
+        File desc = new File(uploadDir + File.separator + fileName);
+
+        if (!desc.exists()) {
+            if (!desc.getParentFile().exists()) {
+                desc.getParentFile().mkdirs();
+            }
+        }
+        return desc;
+    }
+
+    /**
+     * @param uploadDir
+     * @param fileName
+     * @return
+     * @throws IOException
+     */
+    private String getPathFileName(String uploadDir, String fileName) throws IOException {
+        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+        String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
+        return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+    }
+
+
+}
 package com.ruoyi.pojo.vo.bigViewVo;
+import com.alibaba.fastjson2.JSON;
 import lombok.Data;
 /**
- *
  * @author 20412
  */
 @Data
 public class FleetState {
     private String lineName;
     private Integer state;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
 }
@@ -15,15 +15,18 @@ public class LineInfo {
     private PersonInfoVo saleInfoVo;
     private String lineName;
     private String fleetName;
+
     @Data
     public static class PersonInfoVo {
         private String jobCode;
         private String name;
         private Integer signStatus;
+        private String posts;
         public void setSignStatus(SignStatusEnum statusEnum) {
             this.signStatus = statusEnum.getStatus();
         }
+
         public void setSignStatus(Integer status) {
             this.signStatus = status;
         }
+package com.ruoyi.scheduling.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.DriverSchedulingV1;
+
+import javax.annotation.Resource;
+
+@Resource
+public interface SchedulingMapperV1 extends BaseMapper<DriverSchedulingV1> {
+}
+package com.ruoyi.scheduling.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.DriverSchedulingV1;
+
+import java.util.Date;
+import java.util.List;
+
+public interface SchedulingServiceV1 extends IService<DriverSchedulingV1> {
+
+    List<DriverSchedulingV1> queryByJobCodeAndSchedulingDate(String jobCode, Date date);
+}
+package com.ruoyi.scheduling.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.domain.DriverSchedulingV1;
+import com.ruoyi.scheduling.mapper.SchedulingMapperV1;
+import com.ruoyi.scheduling.service.SchedulingServiceV1;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class SchedulingServiceV1Impl extends ServiceImpl<SchedulingMapperV1, DriverSchedulingV1> implements SchedulingServiceV1 {
+
+    @Override
+    public List<DriverSchedulingV1> queryByJobCodeAndSchedulingDate(String jobCode, Date date) {
+        LambdaQueryWrapper<DriverSchedulingV1> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(DriverSchedulingV1::getJobCode, jobCode).eq(DriverSchedulingV1::getScheduleDate, date);
+        wrapper.orderByAsc(DriverSchedulingV1::getFcsjT);
+        return list(wrapper);
+    }
+}
@@ -3,26 +3,25 @@ package com.ruoyi.service;
 import cn.hutool.core.collection.CollectionUtil;
 import com.ruoyi.common.cache.NowSchedulingCache;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.in.mapper.SignInMapper;
 import com.ruoyi.in.service.impl.SignInServiceImpl;
 import com.ruoyi.pojo.DriverSignInRecommendation;
 import com.ruoyi.pojo.GlobalIndex;
-import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.pojo.request.ReportViewRequestVo;
 import com.ruoyi.pojo.response.ReportViewResponseVo;
 import com.ruoyi.utils.ConstDateUtil;
 import com.ruoyi.utils.ToolUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.YearMonth;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -40,6 +39,8 @@ public class SchedulingService {
     @Resource
     private NowSchedulingCache nowSchedulingCache;
+    @Resource
+    private BigViewServiceV1 bigViewServiceV1;
     @Autowired
     private DriverSchedulingMapper schedulingMapper;
@@ -106,6 +107,7 @@ public class SchedulingService {
         return timeMap.get(index);
     }
+
     /**
      * 更具最新的签到记录判断是否需要更新考勤。
      *
@@ -138,6 +140,64 @@ public class SchedulingService {
     }
+    /**
+     * 更具最新的签到记录判断是否需要更新考勤。
+     *
+     * @param signIn
+     */
+    public void computedSignInBySignIn(DriverScheduling driverScheduling, int index, SignIn signIn) {
+        // 无排班不记录不在考勤表不更新
+        if (Objects.isNull(driverScheduling)) {
+            return;
+        }
+        String remark = getRemark(driverScheduling, signIn);
+        // 更新最新的签到记录判断是否需要更新考勤
+        // 记录为空直接插入记录
+        if (Objects.isNull(driverScheduling.getSignInId())) {
+            schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+            // 更新缓存
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn);
+        }
+        // 之前的无效
+        else if (!SIGN_NO_EX_NUM.equals(driverScheduling.getExType())) {
+            schedulingMapper.updateRoster(driverScheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+            nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(driverScheduling.getScheduleDate()), index, signIn);
+        }
+        // 之前的有效
+        else {
+            handlerRecord(driverScheduling, signIn, index);
+        }
+
+    }
+
+    private void handlerRecord(DriverScheduling scheduling, SignIn signIn, Integer index) {
+        if (Objects.isNull(scheduling)) {
+            return;
+        }
+        long timer = 1000 * 60 * 3;
+        // 有效的在三分钟内重复签到不做修改
+        if (signIn.getExType().equals(SIGN_NO_EX_NUM) && (DateUtils.getNowDate().getTime() - scheduling.getSignTime().getTime()) <= timer) {
+            signIn.setRemark("您已经打卡过了，请勿在3分钟内重复打卡");
+            return;
+        }
+        //   目前也有效 -》 无需更新 || 目前无效 -》往后更新
+        //   TODO 判断时间   之前的有效 但是人员提前打卡且还在上次操作有效范围内需要往后偏移
+        //    但是操作一样时间还在有效范围内打卡的话会导致排班表数据不匹配
+
+        if (signIn.getExType().equals(SIGN_NO_EX_NUM)) {
+            if (signIn.getType().equals(bcTypeTransform(scheduling.getBcType()))) {
+                return;
+            }
+        }
+
+
+        String remark = getRemark(scheduling, signIn);
+        signInMapper.updateSignIn(signIn);
+        schedulingMapper.updateRoster(scheduling, signIn.getId(), signIn.getExType(), signIn.getCreateTime(), remark, signIn.getType(), signIn.getAlcoholFlag(), signIn.getAlcoholIntake());
+        nowSchedulingCache.updateCacheByJobCode(remark, ConstDateUtil.formatDate(scheduling.getScheduleDate()), index, signIn);
+    }
+
+
     private String getRemark(List<DriverScheduling> dto, SignIn signIn, Integer globalIndex) {
         StringBuilder sb = new StringBuilder();
         DriverScheduling scheduling = dto.get(globalIndex);
@@ -162,6 +222,25 @@ public class SchedulingService {
         return sb.toString();
     }
+    private String getRemark(DriverScheduling scheduling, SignIn signIn) {
+        StringBuilder sb = new StringBuilder();
+        if (bigViewServiceV1.isEarly(signIn)) {
+            sb.append(EARLY);
+        } else if (bigViewServiceV1.isSignStatusDelayEnum(signIn)) {
+            sb.append(SIGN_STATUS_DELAY_ENUM.getDescription(scheduling.getBcType()));
+        } else {
+            sb.append(signIn.getRemark());
+        }
+
+        if (bigViewServiceV1.isSignStatusWineEnum(signIn) && StringUtils.isNotEmpty(signIn.getRemark())) {
+            int index = signIn.getRemark().indexOf(ALCOHOL_SIGN_IN_ERROR);
+            if (index != -1) {
+                sb.append("," + signIn.getRemark().substring(index));
+            }
+        }
+        return sb.toString();
+    }
+
     private void handlerRecord(List<DriverScheduling> dto, SignIn signIn, GlobalIndex globalIndex) {
         if (globalIndex.getIndex() == dto.size() - 1) {
@@ -189,6 +189,31 @@ public class ThreadJobService {
         }
     }
+    @Async
+    public void asyncInsertExceptionRecord(SignIn signIn, Driver driver, DriverScheduling scheduling) {
+        if (!SIGN_NO_EX_NUM.equals(signIn.getExType())) {
+            EquipmentException exception = new EquipmentException();
+            exception.setExType(signIn.getExType());
+            exception.setDeviceId(signIn.getDeviceId());
+            exception.setJobCode(signIn.getJobCode());
+            exception.setStatus(EQUIPMENT_PROCESS_FLOW_COMMIT);
+            exception.setImage(signIn.getImage());
+            exception.setTitle("打卡异常");
+            exception.setRemark(signIn.getRemark());
+            exception.setCreateTime(signIn.getCreateTime());
+            exception.setFleetName(driver.getFleetName());
+            if (Objects.nonNull(scheduling)) {
+                exception.setNbbm(scheduling.getNbbm());
+                exception.setLineName(scheduling.getLineName());
+                exception.setPlanTime(scheduling.getBcType().equals(BC_TYPE_IN) ? new Date(scheduling.getZdsjT()) : new Date(scheduling.getFcsjT()));
+            }
+            exception.setSignType(signIn.getType());
+            exceptionMapper.insertEquipmentException(exception);
+            // 发送通知
+            sendNotice(signIn, driver, scheduling);
+        }
+    }
+
     private void sendNotice(SignIn signIn, Driver driver, List<DriverScheduling> dto, GlobalIndex globalIndex) {
         if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())) {
             SysNotice notice = new SysNotice();
@@ -219,6 +244,34 @@ public class ThreadJobService {
         }
     }
+    private void sendNotice(SignIn signIn, Driver driver, DriverScheduling item) {
+        if (SIGN_ALCOHOL_EX_NUM.equals(signIn.getExType())) {
+            SysNotice notice = new SysNotice();
+            notice.setCreateBy("system");
+            notice.setUpdateBy("system");
+            notice.setNoticeTitle("酒精测试异常通知");
+
+            if (Objects.isNull(item)) {
+                item = new DriverScheduling();
+                handlerNoScheduling(item, signIn, driver);
+            }
+            String jobCode = "工号：" + item.getJobCode() + "\n";
+            String name = "姓名：" + item.getName() + "\n";
+            String posts = "工种：" + item.getPosts() + "\n";
+            String fleetName = "车队：" + item.getFleetName() + "\n";
+            String scheduling = "排班：" + (Objects.isNull(item.getScheduleDate()) ? "无排班" : "有排班") + "\n";
+            String signDate = "打卡时间：" + ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", signIn.getCreateTime()) + "\n";
+            String cause = "原因：酒精测试超标，当前测试值达到" + signIn.getAlcoholIntake() + "mg/100ml。属于" + getResultString(signIn.getAlcoholIntake());
+            String content = jobCode + name + posts + fleetName + scheduling + signDate + cause;
+            notice.setNoticeContent(content);
+            notice.setNoticeType("1");
+            notice.setStatus("0");
+            notice.setCreateTime(DateUtils.getNowDate());
+            notice.setUpdateTime(DateUtils.getNowDate());
+            noticeService.insertNotice(notice);
+        }
+    }
+
     private String getResultString(BigDecimal alcoholIntake) {
         if (alcoholIntake.compareTo(new BigDecimal(20)) >= 0 && alcoholIntake.compareTo(new BigDecimal(80)) < 0) {
             return "饮酒后驾驶机动车";
@@ -269,6 +322,28 @@ public class ThreadJobService {
     }
+    /**
+     * 异步发送邮件
+     *
+     * @param scheduling
+     * @param signIn
+     * @param driver
+     */
+    @Async
+    public void asyncSendEmail(DriverScheduling scheduling, SignIn signIn, Driver driver) {
+        DriverScheduling item = null;
+        if (Objects.isNull(scheduling)) {
+            item = new DriverScheduling();
+            handlerNoScheduling(item, signIn, driver);
+            // 无排班
+            emailService.sendWarningEmail(item, signIn.getCreateTime(), signIn.getAlcoholIntake());
+        } else {
+            // 有排班
+            emailService.sendWarningEmail(scheduling, signIn.getCreateTime(), signIn.getAlcoholIntake());
+        }
+
+    }
+
     private void handlerNoScheduling(DriverScheduling item, SignIn signIn, Driver driver) {
         BeanUtils.copyProperties(signIn, item);
         item.setName(driver.getPersonnelName());
@@ -104,10 +104,14 @@ public class BigViewServiceImpl implements BigViewService {
                 for (LineInfo lineInfo : fleetInfo.getLineInfos()) {
                     LineInfo.PersonInfoVo driverInfoVo = lineInfo.getDriverInfoVo();
                     LineInfo.PersonInfoVo saleInfoVo = lineInfo.getSaleInfoVo();
-                    Integer driverStatus = handleStateByPerson(driverInfoVo);
-                    Integer saleStatus = handleStateByPerson(saleInfoVo);
-                    int maxState = Math.max(driverStatus, saleStatus);
-                    state = Math.max(maxState, state);
+                    if(Objects.nonNull(driverInfoVo) && Objects.nonNull(saleInfoVo)) {
+                        Integer driverStatus = handleStateByPerson(driverInfoVo);
+                        Integer saleStatus = handleStateByPerson(saleInfoVo);
+                        if(Objects.nonNull(driverStatus) && Objects.nonNull(saleStatus)) {
+                            int maxState = Math.max(driverStatus, saleStatus);
+                            state = Math.max(maxState, state);
+                        }
+                    }
                 }
                 FleetState fleetState = new FleetState();
                 fleetState.setState(state);
 package com.ruoyi.template.domain;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -56,15 +55,6 @@ public class FleetLineTemplate extends BaseEntity
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("fleetName", getFleetName())
-            .append("lineName", getLineName())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .append("remark", getRemark())
-            .toString();
+        return JSON.toJSONString(this);
     }
 }
 package com.ruoyi.template.service;
-import java.util.List;
 import com.ruoyi.template.domain.FleetLineTemplate;
+import java.util.List;
+
 /**
  * 车队与线路对应模板Service接口
  * 
@@ -28,6 +29,13 @@ public interface IFleetLineTemplateService
     public List<FleetLineTemplate> selectFleetLineTemplateList(FleetLineTemplate fleetLineTemplate);
     /**
+     * 查询车队与线路对应模板列表
+     *
+     * @return 车队与线路对应模板集合
+     */
+     List<FleetLineTemplate> selectFleetLineTemplateList();
+
+    /**
      * 新增车队与线路对应模板
      * 
      * @param fleetLineTemplate 车队与线路对应模板
 package com.ruoyi.template.service.impl;
-import java.util.List;
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.template.mapper.FleetLineTemplateMapper;
 import com.ruoyi.template.domain.FleetLineTemplate;
+import com.ruoyi.template.mapper.FleetLineTemplateMapper;
 import com.ruoyi.template.service.IFleetLineTemplateService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 /**
  * 车队与线路对应模板Service业务层处理
- * 
+ *
  * @author guzijian
  * @date 2023-12-04
  */
+@Slf4j
 @Service
-public class FleetLineTemplateServiceImpl implements IFleetLineTemplateService 
-{
+public class FleetLineTemplateServiceImpl implements IFleetLineTemplateService {
     @Autowired
     private FleetLineTemplateMapper fleetLineTemplateMapper;
+    @Autowired
+    private RedisCache redisCache;
+
+    private static final String CONFIG_LINE = "config:fleet:line:template";
+
     /**
      * 查询车队与线路对应模板
-     * 
+     *
      * @param id 车队与线路对应模板主键
      * @return 车队与线路对应模板
      */
     @Override
-    public FleetLineTemplate selectFleetLineTemplateById(String id)
-    {
+    public FleetLineTemplate selectFleetLineTemplateById(String id) {
         return fleetLineTemplateMapper.selectFleetLineTemplateById(id);
     }
     /**
      * 查询车队与线路对应模板列表
-     * 
+     *
      * @param fleetLineTemplate 车队与线路对应模板
      * @return 车队与线路对应模板
      */
     @Override
-    public List<FleetLineTemplate> selectFleetLineTemplateList(FleetLineTemplate fleetLineTemplate)
-    {
+    public List<FleetLineTemplate> selectFleetLineTemplateList(FleetLineTemplate fleetLineTemplate) {
         return fleetLineTemplateMapper.selectFleetLineTemplateList(fleetLineTemplate);
     }
+    @Override
+    public List<FleetLineTemplate> selectFleetLineTemplateList() {
+        List<FleetLineTemplate> fleetLineTemplates = getFleetLineTemplateOfRedis();
+        if (CollectionUtils.isEmpty(fleetLineTemplates)) {
+            fleetLineTemplates = selectFleetLineTemplateList(new FleetLineTemplate());
+            if (CollectionUtils.isNotEmpty(fleetLineTemplates)) {
+                redisCache.setCacheObject(CONFIG_LINE, JSON.toJSONString(fleetLineTemplates));
+            }
+        }
+
+        return fleetLineTemplates;
+    }
+
     /**
      * 新增车队与线路对应模板
-     * 
+     *
      * @param fleetLineTemplate 车队与线路对应模板
      * @return 结果
      */
     @Override
-    public int insertFleetLineTemplate(FleetLineTemplate fleetLineTemplate)
-    {
+    public int insertFleetLineTemplate(FleetLineTemplate fleetLineTemplate) {
         fleetLineTemplate.setCreateTime(DateUtils.getNowDate());
-    fleetLineTemplate.setCreateBy(SecurityUtils.getUsername());
+        fleetLineTemplate.setCreateBy(SecurityUtils.getUsername());
         return fleetLineTemplateMapper.insertFleetLineTemplate(fleetLineTemplate);
     }
     /**
      * 修改车队与线路对应模板
-     * 
+     *
      * @param fleetLineTemplate 车队与线路对应模板
      * @return 结果
      */
     @Override
-    public int updateFleetLineTemplate(FleetLineTemplate fleetLineTemplate)
-    {
+    public int updateFleetLineTemplate(FleetLineTemplate fleetLineTemplate) {
         fleetLineTemplate.setUpdateTime(DateUtils.getNowDate());
-    fleetLineTemplate.setUpdateBy(SecurityUtils.getUsername());
+        fleetLineTemplate.setUpdateBy(SecurityUtils.getUsername());
         return fleetLineTemplateMapper.updateFleetLineTemplate(fleetLineTemplate);
     }
     /**
      * 批量删除车队与线路对应模板
-     * 
+     *
      * @param ids 需要删除的车队与线路对应模板主键
      * @return 结果
      */
     @Override
-    public int deleteFleetLineTemplateByIds(String[] ids)
-    {
+    public int deleteFleetLineTemplateByIds(String[] ids) {
         return fleetLineTemplateMapper.deleteFleetLineTemplateByIds(ids);
     }
     /**
      * 删除车队与线路对应模板信息
-     * 
+     *
      * @param id 车队与线路对应模板主键
      * @return 结果
      */
     @Override
-    public int deleteFleetLineTemplateById(String id)
-    {
+    public int deleteFleetLineTemplateById(String id) {
         return fleetLineTemplateMapper.deleteFleetLineTemplateById(id);
     }
@@ -106,4 +124,16 @@ public class FleetLineTemplateServiceImpl implements IFleetLineTemplateService
     public void insertBatch(List<FleetLineTemplate> templateList) {
         fleetLineTemplateMapper.insertBatch(templateList);
     }
+
+    private List<FleetLineTemplate> getFleetLineTemplateOfRedis() {
+        try {
+            String json = redisCache.getCacheObject(CONFIG_LINE);
+            if (StringUtils.isNotEmpty(json)) {
+                return JSON.parseArray(json, FleetLineTemplate.class);
+            }
+        } catch (Exception e) {
+            log.error("从redis中获取数据异常[{}]", CONFIG_LINE, e);
+        }
+        return null;
+    }
 }
@@ -28,7 +28,7 @@ spring:
             # 主库数据源
             master:
                 # 测试地址
-                url: jdbc:mysql://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
+                url: jdbc:mysql://192.168.168.124:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
                 username: root
                 password: guzijian
             # 从库数据源
@@ -181,7 +181,7 @@ api:
 log:
     path: D:/ruoyi/logs
 server:
-    port: 8100
+    port: 8101
 netty:
     # 是否开启netty服务
     enabled: true
@@ -198,7 +198,7 @@ api:
     people:
       url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
 log:
-  path: /home/health/logs
+  path: /home/health/log.path_IS_UNDEFINED
 netty:
   # 是否开启netty服务
   enabled: true
@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -66,7 +66,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: druid-dev
+    active: druid-prd
   # 文件上传
   servlet:
      multipart:
@@ -164,4 +164,4 @@ api:
     appKey: dingsclwvxui5zilg1xk
     appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
 log:
-  path: E:/ruoyi/logs
 \ No newline at end of file
+  path: logs
 \ No newline at end of file
@@ -3,7 +3,7 @@
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="E:/ruoyi/logs" />-->
 <!--	<property name="log.path" value="D:/ruoyi/logs" />-->
-	<springProperty name="log.path" source="log.path" defaultValue="E:/ruoyi/logs" />
+	<springProperty name="log.path" source="log.path" defaultValue="log.path_IS_UNDEFINED" />
     />
 <!--	<property name="log.path" value="/home/ruoyi/logs" />-->
     <!-- 日志输出格式 -->
 package com.ruoyi.common.core.domain;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 /**
  * Entity基类
 package com.ruoyi.common.core.redis;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.HashOperations;
@@ -14,6 +7,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.stereotype.Component;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
 /**
  * spring redis 工具类
  *
@@ -31,10 +27,12 @@ public class RedisCache {
      * @param key   缓存的键值
      * @param value 缓存的值
      */
+    @Deprecated
     public <T> void setCacheObject(final String key, final T value) {
         redisTemplate.opsForValue().set(key, value);
     }
+
     /**
      * 缓存基本的对象，Integer、String、实体类等
      *
@@ -46,6 +44,7 @@ public class RedisCache {
     public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
+
     public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
         redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
     }
@@ -69,8 +68,8 @@ public class RedisCache {
      * @param unit    时间单位
      * @return true=设置成功；false=设置失败
      */
-    public void expire(final String key,Object val ,final long timeout, final TimeUnit unit) {
-        redisTemplate.opsForValue().set(key, val,timeout, unit);
+    public void expire(final String key, Object val, final long timeout, final TimeUnit unit) {
+        redisTemplate.opsForValue().set(key, val, timeout, unit);
     }
     /**
@@ -241,7 +240,7 @@ public class RedisCache {
      */
     public <T> void setCacheMapValue(final String key, final String hKey, final T value, long timeOut, TimeUnit timeUnit) {
         redisTemplate.opsForHash().put(key, hKey, value);
-        redisTemplate.expire(key,timeOut,timeUnit);
+        redisTemplate.expire(key, timeOut, timeUnit);
     }
     /**
@@ -278,8 +277,8 @@ public class RedisCache {
         return redisTemplate.opsForHash().delete(key, hKey) > 0;
     }
-    public Integer setIncrementMapValue(String key, String hkey, Integer value){
-        return redisTemplate.opsForHash().increment(key,hkey,value.longValue()).intValue();
+    public Integer setIncrementMapValue(String key, String hkey, Integer value) {
+        return redisTemplate.opsForHash().increment(key, hkey, value.longValue()).intValue();
     }
     /**
@@ -292,7 +291,7 @@ public class RedisCache {
         return redisTemplate.keys(pattern);
     }
-    public <T> Set<T> getHashKeys(String key){
+    public <T> Set<T> getHashKeys(String key) {
         return redisTemplate.opsForHash().keys(key);
     }
@@ -301,8 +300,14 @@ public class RedisCache {
         return result != null && result;
     }
+    public boolean setNx(String key, Object val, Long timeout, TimeUnit unit) {
+        Boolean result = redisTemplate.opsForValue().setIfAbsent(key, val, timeout, unit);
+        return result != null && result;
+    }
+
     public Long increment(String key) {
         Long increment = redisTemplate.opsForValue().increment(key);
         return increment;
     }
+
 }
@@ -9,15 +9,17 @@ import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Date;
+import java.util.Objects;
+
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
 /**
  * 时间工具类
- * 
+ *
  * @author ruoyi
  */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils
-{
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
     public static String YYYY = "yyyy";
     public static String YYYY_MM = "yyyy-MM";
@@ -28,65 +30,72 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
+
     private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", 
+            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+    public static FastDateFormat FAST_YYYY_MM_DD = FastDateFormat.getInstance("yyyy-MM-DD");
+
     /**
      * 获取当前Date型日期
-     * 
+     *
      * @return Date() 当前日期
      */
-    public static Date getNowDate()
-    {
+    public static Date getNowDate() {
         return new Date();
     }
+    public static Date shortDate() {
+        return shortDate(getNowDate());
+    }
+
+    public static Date shortDate(Date date) {
+        if (Objects.isNull(date)) {
+            return null;
+        }
+        try {
+            return FAST_YYYY_MM_DD.parse(FAST_YYYY_MM_DD.format(date));
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     /**
      * 获取当前日期, 默认格式为yyyy-MM-dd
-     * 
+     *
      * @return String
      */
-    public static String getDate()
-    {
+    public static String getDate() {
         return dateTimeNow(YYYY_MM_DD);
     }
-    public static final String getTime()
-    {
+    public static final String getTime() {
         return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
     }
-    public static final String dateTimeNow()
-    {
+    public static final String dateTimeNow() {
         return dateTimeNow(YYYYMMDDHHMMSS);
     }
-    public static final String dateTimeNow(final String format)
-    {
+    public static final String dateTimeNow(final String format) {
         return parseDateToStr(format, new Date());
     }
-    public static final String dateTime(final Date date)
-    {
+    public static final String dateTime(final Date date) {
         return parseDateToStr(YYYY_MM_DD, date);
     }
-    public static final String parseDateToStr(final String format, final Date date)
-    {
+    public static final String parseDateToStr(final String format, final Date date) {
         return new SimpleDateFormat(format).format(date);
     }
-    public static final Date dateTime(final String format, final String ts)
-    {
-        try
-        {
+    public static final Date dateTime(final String format, final String ts) {
+        try {
             return new SimpleDateFormat(format).parse(ts);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             throw new RuntimeException(e);
         }
     }
@@ -94,8 +103,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如2018/08/08
      */
-    public static final String datePath()
-    {
+    public static final String datePath() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyy/MM/dd");
     }
@@ -103,8 +111,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期路径 即年/月/日 如20180808
      */
-    public static final String dateTime()
-    {
+    public static final String dateTime() {
         Date now = new Date();
         return DateFormatUtils.format(now, "yyyyMMdd");
     }
@@ -112,18 +119,13 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 日期型字符串转化为日期 格式
      */
-    public static Date parseDate(Object str)
-    {
-        if (str == null)
-        {
+    public static Date parseDate(Object str) {
+        if (str == null) {
             return null;
         }
-        try
-        {
+        try {
             return parseDate(str.toString(), parsePatterns);
-        }
-        catch (ParseException e)
-        {
+        } catch (ParseException e) {
             return null;
         }
     }
@@ -131,8 +133,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 获取服务器启动时间
      */
-    public static Date getServerStartDate()
-    {
+    public static Date getServerStartDate() {
         long time = ManagementFactory.getRuntimeMXBean().getStartTime();
         return new Date(time);
     }
@@ -140,20 +141,18 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算相差天数
      */
-    public static int differentDaysByMillisecond(Date date1, Date date2)
-    {
+    public static int differentDaysByMillisecond(Date date1, Date date2) {
         return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
     }
     /**
      * 计算时间差
      *
-     * @param endTime 最后时间
+     * @param endTime   最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
-    public static String timeDistance(Date endDate, Date startTime)
-    {
+    public static String timeDistance(Date endDate, Date startTime) {
         long nd = 1000 * 24 * 60 * 60;
         long nh = 1000 * 60 * 60;
         long nm = 1000 * 60;
@@ -174,8 +173,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDateTime ==> Date
      */
-    public static Date toDate(LocalDateTime temporalAccessor)
-    {
+    public static Date toDate(LocalDateTime temporalAccessor) {
         ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
     }
@@ -183,8 +181,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 增加 LocalDate ==> Date
      */
-    public static Date toDate(LocalDate temporalAccessor)
-    {
+    public static Date toDate(LocalDate temporalAccessor) {
         LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
         ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
         return Date.from(zdt.toInstant());
 package com.ruoyi.system.domain;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import java.util.Date;
 /**
@@ -109,19 +108,20 @@ public class SysNotice extends BaseEntity
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("noticeId", getNoticeId())
-            .append("noticeTitle", getNoticeTitle())
-            .append("noticeType", getNoticeType())
-            .append("noticeContent", getNoticeContent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .append("jobCode", getJobCode())
-            .append("planTime", getPlanTime())
-            .toString();
+//        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+//            .append("noticeId", getNoticeId())
+//            .append("noticeTitle", getNoticeTitle())
+//            .append("noticeType", getNoticeType())
+//            .append("noticeContent", getNoticeContent())
+//            .append("status", getStatus())
+//            .append("createBy", getCreateBy())
+//            .append("createTime", getCreateTime())
+//            .append("updateBy", getUpdateBy())
+//            .append("updateTime", getUpdateTime())
+//            .append("remark", getRemark())
+//            .append("jobCode", getJobCode())
+//            .append("planTime", getPlanTime())
+//            .toString();
+        return JSON.toJSONString(this);
     }
 }