feat: 新增灵活跟班设置。

guzijian
1 parent 0c728fa5
Showing 16 changed files with 579 additions and 30 deletions
Bsth-admin/src/main/java/com/ruoyi/domain/DriverSchedulingExpandSmart.java
Bsth-admin/src/main/java/com/ruoyi/expand/controller/DriverSchedulingExpandController.java
Bsth-admin/src/main/java/com/ruoyi/expand/domain/DriverSchedulingExpand.java
Bsth-admin/src/main/java/com/ruoyi/expand/service/impl/DriverSchedulingExpandServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/interceptor/MybatisPlusDAOInterceptor.java
Bsth-admin/src/main/java/com/ruoyi/job/DriverJob.java
Bsth-admin/src/main/java/com/ruoyi/mapper/DriverSchedulingExpandSmartMapper.java
Bsth-admin/src/main/java/com/ruoyi/pojo/dto/SmartExpandDto.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/ExpandResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/pojo/vo/SmartExpandVo.java
Bsth-admin/src/main/java/com/ruoyi/service/DriverSchedulingExpandSmartService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/DriverSchedulingExpandSmartServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/utils/ToolUtils.java
Bsth-admin/src/main/resources/mapper/DriverSchedulingExpandSmartMapper.xml
Bsth-admin/src/main/resources/mapper/expand/DriverSchedulingExpandMapper.xml
Bsth-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+package com.ruoyi.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 灵活跟班表
+ * @TableName driver_scheduling_expand_smart
+ */
+@TableName(value ="driver_scheduling_expand_smart")
+@Data
+public class DriverSchedulingExpandSmart implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 驾驶员工号
+     */
+    private String masterJobCode;
+
+    /**
+     * 跟班人员工号
+     */
+    private String slaveJobCode;
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill= FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill= FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill= FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill= FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /** 跟班id */
+    private String expandId;
+
+    private String remark;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
@@ -3,18 +3,15 @@ package com.ruoyi.expand.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.global.Result;
+import com.ruoyi.pojo.dto.SmartExpandDto;
 import com.ruoyi.pojo.vo.ExpandResponseViewVo;
+import com.ruoyi.pojo.vo.SmartExpandVo;
+import com.ruoyi.service.DriverSchedulingExpandSmartService;
 import org.springframework.security.access.prepost.PreAuthorize;
 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 org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -37,6 +34,9 @@ public class DriverSchedulingExpandController extends BaseController
     @Autowired
     private IDriverSchedulingExpandService driverSchedulingExpandService;
+    @Autowired
+    private DriverSchedulingExpandSmartService smartService;
+
     /**
      * 查询跟班设置列表
      */
@@ -70,6 +70,41 @@ public class DriverSchedulingExpandController extends BaseController
     }
     /**
+     * 新增灵活跟班
+     */
+    @PreAuthorize("@ss.hasPermi('expand:expand:add')")
+    @Log(title = "新增灵活跟班", businessType = BusinessType.INSERT)
+    @PostMapping("addSmartExpand")
+    public Result<?> smartAdd(@Validated @RequestBody SmartExpandDto dto)
+    {
+        smartService.smartAdd(dto);
+        return Result.OK();
+    }
+
+    /**
+     * 新增灵活跟班
+     */
+    @PreAuthorize("@ss.hasPermi('expand:expand:add')")
+    @Log(title = "新增灵活跟班", businessType = BusinessType.INSERT)
+    @GetMapping("querySmartExpand")
+    public Result<SmartExpandVo> querySmartExpand(@RequestParam("id") Long id )
+    {
+        return Result.OK(smartService.querySmartExpand(id));
+    }
+
+    /**
+     * 新增灵活跟班
+     */
+    @PreAuthorize("@ss.hasPermi('expand:expand:add')")
+    @Log(title = "新增灵活跟班", businessType = BusinessType.INSERT)
+    @PutMapping("updateSmartExpand")
+    public Result<SmartExpandVo> updateSmartExpand(@RequestBody SmartExpandVo vo)
+    {
+        smartService.updateSmartExpand(vo);
+        return Result.OK();
+    }
+
+    /**
      * 修改跟班设置
      */
     @PreAuthorize("@ss.hasPermi('expand:expand:edit')")
@@ -86,8 +121,9 @@ public class DriverSchedulingExpandController extends BaseController
     @PreAuthorize("@ss.hasPermi('expand:expand:remove')")
     @Log(title = "跟班设置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
+    public Result<?> remove(@PathVariable Long[] ids)
     {
-        return toAjax(driverSchedulingExpandService.deleteDriverSchedulingExpandByIds(ids));
+        smartService.deleteExpand(ids);
+        return Result.OK();
     }
 }
@@ -2,6 +2,7 @@ package com.ruoyi.expand.domain;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -16,6 +17,7 @@ import javax.validation.constraints.NotNull;
  * @author guzijian
  * @date 2023-09-12
  */
+@ToString
 public class DriverSchedulingExpand extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -50,12 +52,22 @@ public class DriverSchedulingExpand extends BaseEntity
     @NotNull(message = "结束日期不能为空")
     private Date endDate;
-    public void setId(Long id) 
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
@@ -105,20 +117,4 @@ public class DriverSchedulingExpand extends BaseEntity
         return endDate;
     }
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("status", getStatus())
-            .append("masterJobCode", getMasterJobCode())
-            .append("slaveJobCode", getSlaveJobCode())
-            .append("startDate", getStartDate())
-            .append("endDate", getEndDate())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("createBy", getCreateBy())
-            .append("updateBy", getUpdateBy())
-            .append("remark", getRemark())
-            .toString();
-    }
 }
@@ -35,6 +35,7 @@ public class DriverSchedulingExpandServiceImpl implements IDriverSchedulingExpan
     @Autowired
     private DriverMapper driverMapper;
+
     /**
      * 查询跟班设置
      *
+package com.ruoyi.interceptor;
+
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.ruoyi.common.utils.SecurityUtils;
+import org.apache.ibatis.reflection.MetaObject;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * @author 20412
+ */
+@Component
+public class MybatisPlusDAOInterceptor implements MetaObjectHandler {
+
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        if (metaObject.hasGetter("createTime")){
+            this.strictInsertFill(metaObject, "createTime", Date.class, new Date());
+        }
+
+        if (metaObject.hasGetter("createBy")){
+            if (!Objects.isNull(SecurityUtils.getUsername())){
+                this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getUsername());
+            }
+        }
+
+        if (metaObject.hasGetter("updateTime")){
+            this.strictInsertFill(metaObject, "updateTime", Date.class, new Date());
+        }
+        if (metaObject.hasGetter("updateBy")){
+            if (!Objects.isNull(SecurityUtils.getUsername())){
+                this.strictInsertFill(metaObject, "updateBy", String.class, SecurityUtils.getUsername());
+            }
+        }
+    }
+
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        if (metaObject.hasGetter("updateTime")){
+            this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
+        }
+        if (metaObject.hasGetter("updateBy")){
+            this.strictUpdateFill(metaObject,"updateBy",String.class,SecurityUtils.getUsername());
+        }
+    }
+}
 \ No newline at end of file
@@ -19,6 +19,7 @@ import com.ruoyi.pojo.request.TokenRequestVo;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
 import com.ruoyi.pojo.response.personnel.*;
 import com.ruoyi.pojo.vo.ExpandResponseVo;
+import com.ruoyi.service.DriverSchedulingExpandSmartService;
 import com.ruoyi.service.RuleAttendanceMainService;
 import com.ruoyi.service.RuleNumSettingService;
 import com.ruoyi.service.ThreadJobService;
@@ -85,6 +86,9 @@ public class DriverJob implements InitializingBean {
     private RuleNumSettingService ruleNumSettingService;
     @Autowired
+    private DriverSchedulingExpandSmartService driverSchedulingExpandSmartService;
+
+    @Autowired
     private IDriverService driverService;
     @Autowired
@@ -114,6 +118,7 @@ public class DriverJob implements InitializingBean {
     private static DriverSchedulingExpandMapper EXPAND_MAPPER;
+    private static DriverSchedulingExpandSmartService EXPAND_SMART_SERVICE;
     private static RuleNumSettingService RULE_NUM_SETTING_SERVICE;
     private static RuleAttendanceMainService ATTENDANCE_MAIN_SERVICE;
     private static NowSchedulingCache NOW_SCHEDULING_CACHE;
@@ -287,6 +292,13 @@ public class DriverJob implements InitializingBean {
     }
     /**
+     * 计算灵活跟班
+     */
+    public void computedExpandSmart() {
+        EXPAND_SMART_SERVICE.computedExpand();
+    }
+
+    /**
      * 生成排班 每天早上在获取调度排班前生成
      */
     public void createAttendance() {
@@ -601,5 +613,6 @@ public class DriverJob implements InitializingBean {
         RULE_NUM_SETTING_SERVICE = ruleNumSettingService;
         EXPAND_MAPPER = expandMapper;
         ATTENDANCE_MAIN_SERVICE = attendanceMainService;
+        EXPAND_SMART_SERVICE = driverSchedulingExpandSmartService;
     }
 }
+package com.ruoyi.mapper;
+
+import com.ruoyi.domain.DriverSchedulingExpandSmart;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.pojo.vo.SmartExpandVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author 20412
+* @description 针对表【driver_scheduling_expand_smart(灵活跟班表)】的数据库操作Mapper
+* @createDate 2024-03-07 16:49:40
+* @Entity .domain.DriverSchedulingExpandSmart
+*/
+public interface DriverSchedulingExpandSmartMapper extends BaseMapper<DriverSchedulingExpandSmart> {
+
+    SmartExpandVo querySmartExpand(@Param("id") Long id);
+
+    List<SmartExpandVo> querySmartExpandAll();
+}
+
+
+
+
+package com.ruoyi.pojo.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class SmartExpandDto {
+    private String slaveJobCode;
+    private Integer type;
+    private String remark;
+    private List<Activity> activities;
+
+    @Data
+    public static class Activity {
+        private String name;
+        private String masterJobCode;
+        private Date startDate;
+        private Date endDate;
+    }
+}
@@ -18,6 +18,7 @@ public class ExpandResponseVo {
     private Integer status;
     private Date startDate;
     private Date endDate;
+    private Integer type;
 }
+package com.ruoyi.pojo.vo;
+
+import com.ruoyi.pojo.dto.SmartExpandDto;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class SmartExpandVo {
+    private Long id;
+    private String slaveJobCode;
+    private Integer type;
+    private String remark;
+    private List<Activity> activities;
+
+    @Data
+    public static class Activity {
+        private String uuId;
+        private String name;
+        private String masterJobCode;
+        private Date startDate;
+        private Date endDate;
+    }
+}
+package com.ruoyi.service;
+
+import com.ruoyi.domain.DriverSchedulingExpandSmart;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.pojo.dto.SmartExpandDto;
+import com.ruoyi.pojo.vo.SmartExpandVo;
+
+/**
+* @author 20412
+* @description 针对表【driver_scheduling_expand_smart(灵活跟班表)】的数据库操作Service
+* @createDate 2024-03-07 16:49:40
+*/
+public interface DriverSchedulingExpandSmartService extends IService<DriverSchedulingExpandSmart> {
+
+    void smartAdd(SmartExpandDto dto);
+
+    void computedExpand();
+
+    SmartExpandVo querySmartExpand(Long id);
+
+    void updateSmartExpand(SmartExpandVo vo);
+
+    void deleteExpand(Long[] ids);
+}
+package com.ruoyi.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.global.ResultCode;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.domain.DriverSchedulingExpandSmart;
+import com.ruoyi.expand.domain.DriverSchedulingExpand;
+import com.ruoyi.expand.mapper.DriverSchedulingExpandMapper;
+import com.ruoyi.expand.service.IDriverSchedulingExpandService;
+import com.ruoyi.pojo.dto.SmartExpandDto;
+import com.ruoyi.pojo.vo.SmartExpandVo;
+import com.ruoyi.service.DriverSchedulingExpandSmartService;
+import com.ruoyi.mapper.DriverSchedulingExpandSmartMapper;
+import com.ruoyi.utils.ConstDateUtil;
+import com.ruoyi.utils.ToolUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 20412
+ * @description 针对表【driver_scheduling_expand_smart(灵活跟班表)】的数据库操作Service实现
+ * @createDate 2024-03-07 16:49:40
+ */
+@Service
+@Slf4j
+public class DriverSchedulingExpandSmartServiceImpl extends ServiceImpl<DriverSchedulingExpandSmartMapper, DriverSchedulingExpandSmart>
+        implements DriverSchedulingExpandSmartService {
+
+    @Autowired
+    private IDriverSchedulingExpandService expandService;
+
+    @Autowired
+    private DriverSchedulingExpandMapper expandMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void smartAdd(SmartExpandDto dto) {
+        List<DriverSchedulingExpandSmart> list = new ArrayList<>(dto.getActivities().size());
+        for (SmartExpandDto.Activity activity : dto.getActivities()) {
+            DriverSchedulingExpandSmart smart = new DriverSchedulingExpandSmart();
+            BeanUtils.copyProperties(activity, smart, "id");
+            smart.setSlaveJobCode(dto.getSlaveJobCode());
+            list.add(smart);
+        }
+        list.sort(Comparator.comparing(DriverSchedulingExpandSmart::getStartDate));
+        // 校验跟班时间正确
+        isExpandCorrect(list);
+        // 保存记录
+        DriverSchedulingExpand expand = new DriverSchedulingExpand();
+        BeanUtils.copyProperties(list.get(0), expand);
+        expand.setType(dto.getType());
+        expand.setRemark(dto.getRemark());
+        expandService.insertDriverSchedulingExpand(expand);
+        for (DriverSchedulingExpandSmart item : list) {
+            item.setExpandId(expand.getId().toString());
+        }
+        this.saveBatch(list);
+    }
+
+    @Override
+    public void computedExpand() {
+        try {
+            List<SmartExpandVo> vos = baseMapper.querySmartExpandAll();
+            int sum = 0;
+            for (SmartExpandVo vo : vos) {
+                SmartExpandVo.Activity activity = handlerSmartExpand(vo);
+                DriverSchedulingExpand expand = new DriverSchedulingExpand();
+                BeanUtils.copyProperties(activity, expand);
+                expand.setId(vo.getId());
+                expand.setType(1);
+                expand.setSlaveJobCode(vo.getSlaveJobCode());
+                int result = expandMapper.updateDriverSchedulingExpand(expand);
+                sum += result;
+            }
+            log.info("跟班计算完毕，共修改{}数据", sum);
+
+        } catch (Exception e) {
+            log.info("跟班计算出现问题:{}", e.getMessage());
+        }
+    }
+
+    private SmartExpandVo.Activity handlerSmartExpand(SmartExpandVo vo) {
+        vo.getActivities().sort(Comparator.comparing(SmartExpandVo.Activity::getStartDate));
+        Date date = new Date();
+        for (int i = 0; i < vo.getActivities().size(); i++) {
+            int compare = StringUtils.compare(ConstDateUtil.formatDate(date), ConstDateUtil.formatDate(vo.getActivities().get(i).getEndDate()));
+            if (compare > 0 && i < vo.getActivities().size() - 1) {
+                continue;
+            }
+            return vo.getActivities().get(i);
+        }
+        log.error("没有找到跟班对象：{}", vo);
+        throw new ServiceException("未知错误", ResultCode.CODE_500.getCode());
+    }
+
+    @Override
+    public SmartExpandVo querySmartExpand(Long id) {
+        return baseMapper.querySmartExpand(id);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateSmartExpand(SmartExpandVo vo) {
+        List<DriverSchedulingExpandSmart> list = new ArrayList<>(vo.getActivities().size());
+        // 删除老数据
+        LambdaQueryWrapper<DriverSchedulingExpandSmart> qw = new LambdaQueryWrapper<>();
+        qw.eq(DriverSchedulingExpandSmart::getExpandId, vo.getId());
+        remove(qw);
+        // COPY
+        for (SmartExpandVo.Activity activity : vo.getActivities()) {
+            DriverSchedulingExpandSmart smart = new DriverSchedulingExpandSmart();
+            BeanUtils.copyProperties(activity, smart, "id");
+            smart.setSlaveJobCode(vo.getSlaveJobCode());
+            list.add(smart);
+        }
+        list.sort(Comparator.comparing(DriverSchedulingExpandSmart::getStartDate));
+        for (DriverSchedulingExpandSmart item : list) {
+            item.setExpandId(vo.getId().toString());
+        }
+        this.saveBatch(list);
+        // 更新当前跟班显示
+        DriverSchedulingExpandSmart smart = ToolUtils.computedShowSmart(list);
+        DriverSchedulingExpand expand = new DriverSchedulingExpand();
+        BeanUtils.copyProperties(expand, smart, "id");
+        expand.setRemark(vo.getRemark());
+        expand.setType(vo.getType());
+        expand.setId(vo.getId());
+        expandService.updateDriverSchedulingExpand(expand);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteExpand(Long[] ids) {
+        expandService.deleteDriverSchedulingExpandByIds(ids);
+        LambdaQueryWrapper<DriverSchedulingExpandSmart> qw = new LambdaQueryWrapper<>();
+        qw.eq(DriverSchedulingExpandSmart::getExpandId, ids[0]);
+        remove(qw);
+    }
+
+    private void isExpandCorrect(List<DriverSchedulingExpandSmart> list) {
+        // 校验跟班人选中的时间日期是否合法
+        long day = 1000 * 60 * 60 * 24;
+        for (int i = 0; i < list.size() - 1; i++) {
+            if (list.get(i + 1).getStartDate().getTime() - list.get(i).getEndDate().getTime() < day) {
+                String errMsg = "时间区间设置不正确，请确保时间是递增的" + ConstDateUtil.formatDate("yyyy-MM-dd", list.get(i).getEndDate()) + "->" + ConstDateUtil.formatDate("yyyy-MM-dd", list.get(i + 1).getStartDate());
+                throw new ServiceException(errMsg, ResultCode.CODE_400.getCode());
+            }
+        }
+    }
+}
+
+
+
+
 package com.ruoyi.utils;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.global.Result;
+import com.ruoyi.common.global.ResultCode;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.uuid.UUID;
 import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.DriverSchedulingExpandSmart;
 import com.ruoyi.domain.RuleAttendanceMain;
 import com.ruoyi.num.domain.RuleNum;
 import com.ruoyi.pojo.dto.RuleSchedulingDto;
 import com.ruoyi.scheduling.domain.RuleScheduling;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import java.util.Comparator;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 import static com.ruoyi.common.ConstDriverProperties.BC_TYPE_IN;
@@ -20,6 +29,8 @@ import static com.ruoyi.common.SignStatusEnum.SIGN_STATUS_ZONE_ENUM;
 public class ToolUtils {
+    private static final Logger log = LoggerFactory.getLogger(ToolUtils.class);
+
     public static String getUUID() {
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
@@ -95,4 +106,20 @@ public class ToolUtils {
     }
+    public static DriverSchedulingExpandSmart computedShowSmart(List<DriverSchedulingExpandSmart> list) {
+        // 遍历 规则 范围内-》 范围外 往后显示
+        list.sort(Comparator.comparing(DriverSchedulingExpandSmart::getStartDate));
+        Date date = new Date();
+        for (int i = 0; i < list.size(); i++) {
+            int compare = StringUtils.compare(ConstDateUtil.formatDate(date), ConstDateUtil.formatDate(list.get(i).getEndDate()));
+            if (compare > 0 && i < list.size() - 1) {
+                continue;
+            }
+            return list.get(i);
+        }
+
+        log.error("没有找到跟班对象：{}", list);
+        throw new ServiceException("未知错误", ResultCode.CODE_500.getCode());
+    }
+
 }
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.mapper.DriverSchedulingExpandSmartMapper">
+
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.DriverSchedulingExpandSmart">
+            <id property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="name" column="name" jdbcType="VARCHAR"/>
+            <result property="expandId" column="expand_id" jdbcType="VARCHAR"/>
+            <result property="masterJobCode" column="master_job_code" jdbcType="VARCHAR"/>
+            <result property="slaveJobCode" column="slave_job_code" jdbcType="VARCHAR"/>
+            <result property="startDate" column="start_date" jdbcType="DATE"/>
+            <result property="endDate" column="end_date" jdbcType="DATE"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+            <result property="remark" column="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+    <resultMap id="SmartExpandVo" type="com.ruoyi.pojo.vo.SmartExpandVo">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="slaveJobCode" column="slave_job_code" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="TINYINT"/>
+        <result property="remark" column="remark" jdbcType="VARCHAR"/>
+        <collection property="activities" ofType="com.ruoyi.pojo.vo.SmartExpandVo$Activity">
+            <result column="name" property="name" jdbcType="VARCHAR"/>
+            <result column="smart_id" property="uuId" jdbcType="VARCHAR"/>
+            <result column="master_job_code" property="masterJobCode" jdbcType="VARCHAR"/>
+            <result column="start_date" property="startDate" jdbcType="DATE"/>
+            <result column="end_date" property="endDate" jdbcType="DATE"/>
+        </collection>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,expand_id,`name`,master_job_code,
+        slave_job_code,start_date,end_date,
+        create_by,update_by,create_time,
+        update_time,remark
+    </sql>
+    <select id="querySmartExpand" resultMap="SmartExpandVo" resultType="com.ruoyi.pojo.vo.SmartExpandVo">
+        SELECT
+            expand.id,
+            expand.slave_job_code,
+            expand.type,
+            expand.remark,
+            smart.id smart_id,
+            smart.start_date,
+            smart.end_date,
+            smart.master_job_code,
+            smart.`name`
+        FROM
+            driver_scheduling_expand expand,
+            driver_scheduling_expand_smart smart
+        WHERE
+            expand.id = smart.expand_id
+            AND expand.id = #{id}
+    </select>
+    <select id="querySmartExpandAll" resultMap="SmartExpandVo" resultType="com.ruoyi.pojo.vo.SmartExpandVo">
+        SELECT
+            expand.id,
+            expand.slave_job_code,
+            expand.type,
+            expand.remark,
+            smart.id smart_id,
+            smart.start_date,
+            smart.end_date,
+            smart.master_job_code,
+            smart.`name`
+        FROM
+            driver_scheduling_expand expand,
+            driver_scheduling_expand_smart smart
+        WHERE
+            expand.id = smart.expand_id
+    </select>
+</mapper>
@@ -16,6 +16,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="createBy"    column="create_by"    />
         <result property="updateBy"    column="update_by"    />
         <result property="remark"    column="remark"    />
+        <result property="type"    column="type"    />
     </resultMap>
     <resultMap id="DriverSchedulingExpandDto" type="com.ruoyi.pojo.vo.ExpandResponseVo">
@@ -28,10 +29,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="slaveName"    column="slaveName"    />
         <result property="slaveFleetName"    column="slaveFleetName"    />
         <result property="slavePosts"    column="slavePosts"    />
+        <result property="type"    column="type"    />
     </resultMap>
     <sql id="selectDriverSchedulingExpandVo">
-        select id, status, master_job_code, slave_job_code, start_date, end_date, create_time, update_time, create_by, update_by, remark from driver_scheduling_expand
+        select id, status, master_job_code, slave_job_code, start_date, end_date, create_time, update_time, create_by, update_by, remark,type from driver_scheduling_expand
     </sql>
     <select id="selectDriverSchedulingExpandList" parameterType="DriverSchedulingExpand" resultMap="DriverSchedulingExpandResult">
@@ -80,6 +82,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">create_by,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="remark != null">remark,</if>
+            <if test="type != null">type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="status != null">#{status},</if>
@@ -92,6 +95,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">#{createBy},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="type != null">#{type},</if>
          </trim>
     </insert>
@@ -108,6 +112,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="type != null">`type` = #{type},</if>
         </trim>
         where id = #{id}
     </update>
@@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/big/view/**","/report/list/**","/system/dict/data/**","/app/version/check/**","/app/checkDeviceHeart","/app/download","/driver/**","/in/**","/eexception/**","/equipment/**","/report/**","/login", "/register", "/captchaImage").permitAll()
+                .antMatchers("/big/view/queryNumberByType","/big/view/queryLineInfo/*","/big/view/querySignDetails","/report/list/**","/system/dict/data/**","/app/version/check/**","/app/checkDeviceHeart","/app/download","/driver/**","/in/**","/eexception/**","/equipment/**","/report/**","/login", "/register", "/captchaImage").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()