对接统一登录平台和优化

liujun001
1 parent 51a1f0c5
Showing 33 changed files with 2011 additions and 40 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/LingangCarInfo.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/LingangCarInfoAddDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/LingangCarInfoQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/caiinfo/dto/LingangCarInfoUpdateDTO.java
Bsth-admin/src/main/java/com/ruoyi/job/SignReportSummerJob.java
Bsth-admin/src/main/java/com/ruoyi/mapper/carinfo/LingangCarInfoMapper.java
Bsth-admin/src/main/java/com/ruoyi/mapper/key/info/KeyInfoMapper.java
Bsth-admin/src/main/java/com/ruoyi/mapper/scheduling/LinggangSchedulingMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/carinfo/LingangCarInfoService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/carinfo/LingangCarInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/info/KeyInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/scheduling/LinggangSchedulingServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/key/info/KeyInfoService.java
Bsth-admin/src/main/java/com/ruoyi/service/scheduling/LinggangSchedulingService.java
Bsth-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
Bsth-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
Bsth-admin/src/main/resources/application-druid-lingangPrd.yml
@@ -12,6 +12,7 @@ import com.ruoyi.domain.sign.in.summary.SignReportDaySummary;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.job.DriverJob;
+import com.ruoyi.job.SignReportSummerJob;
 import com.ruoyi.service.SignReportServer;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
@@ -60,6 +61,8 @@ public class RefreshController {
     private SignReportDaySummaryService signReportDaySummaryService;
     @Autowired
     private SignReportServer signReportServer;
+    @Autowired
+    private SignReportSummerJob signReportSummerJob;
     @GetMapping(value = "/scheduling")
@@ -109,7 +112,7 @@ public class RefreshController {
     @GetMapping(value = "/driver")
     @ApiOperation("driver")
-    @PreAuthorize("@ss.hasPermi('refresh:driver')")
+    //@PreAuthorize("@ss.hasPermi('refresh:driver')")
     public ResponseResult<Boolean> insertDriver() {
         newDriverService.insertJob();
         log.info("人员信息同步完毕");
@@ -331,4 +334,12 @@ public class RefreshController {
         return ResponseResult.success();
     }
+    @GetMapping(value = "/sign/report/summary/day")
+    @ApiOperation("/sign/report/summary/day")
+    public ResponseResult<String> signReportSummary1() throws ParseException {
+        signReportSummerJob.calSignReportSummary();
+
+        return ResponseResult.success();
+    }
+
 }
@@ -224,8 +224,12 @@ public class KeyBoxController extends BaseController {
                 logger.info("根据DTO的数据无法查询车辆信息:[{}]", dto);
             }
+            scheduling.setEndScheduleDate(org.apache.commons.lang3.time.DateUtils.addMonths(scheduling.getStartScheduleDate(), 1));
+            scheduling.setStartScheduleDate(org.apache.commons.lang3.time.DateUtils.addMonths(dto.getTime(), -1));
-            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList);
+
+            Collection<String> nbbms1 = schedulingService.listNbbmByEntity(scheduling);
+            BasicSyncVo vo = convertBasicSyncVo(workLocations, schedulings, keyInfos, drivers, carInfos, equipment, venueInfo, equipmentList, nbbms1);
             return ResponseResult.success(vo);
         } catch (ParseException e) {
             logger.error("钥匙柜基础信息同步异常:[{}]", dto, e);
@@ -835,6 +839,7 @@ public class KeyBoxController extends BaseController {
         if (Objects.nonNull(venueInfo)) {
             vo.setYardId(Convert.toStr(venueInfo.getId()));
             vo.setYardName(venueInfo.getName());
+
         }
@@ -855,7 +860,7 @@ public class KeyBoxController extends BaseController {
     private BasicSyncVo convertBasicSyncVo(List<LinggangKeyWorkLocation> workLocations, List<LinggangScheduling> schedulings,
                                            List<KeyInfo> keyInfos, List<NewDriver> drivers, List<CarInfo> carInfos, Equipment equipment,
-                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList) {
+                                           LinggangVenueInfo venueInfo, List<Equipment> equipmentList, Collection<String> nbbms1) {
         BasicSyncVo vo = new BasicSyncVo();
         vo.setDevice(equipment.getDeviceId());
@@ -924,11 +929,9 @@ public class KeyBoxController extends BaseController {
             });
         }
         vo.setDriverWork(driverWork);
-        if (CollectionUtils.isNotEmpty(schedulings) && CollectionUtils.isNotEmpty(carInfos)) {
-            Set<String> nbbms = schedulings.stream().filter(s -> Objects.equals(s.getQdzcode(), venueInfo.getParkCode()) ||
-                    Objects.equals(s.getZdzcode(), venueInfo.getParkCode())).map(LinggangScheduling::getNbbm).collect(Collectors.toSet());
-            List<String> plateNums = carInfos.stream().filter(c -> nbbms.contains(c.getNbbm())).map(CarInfo::getNbbm).collect(Collectors.toList());
-            vo.setYardVehicles(plateNums);
+        if (CollectionUtils.isNotEmpty(nbbms1)) {
+            List<String> nbbms2 = nbbms1.stream().collect(Collectors.toList());
+            vo.setYardVehicles(nbbms2);
         }
@@ -966,6 +969,7 @@ public class KeyBoxController extends BaseController {
                 Optional<LinggangKeyWorkLocation> opt = schedulings.stream().filter(s -> Objects.equals(item.getKey(), s.getCabinetNo())).findFirst();
                 if (opt.isPresent()) {
                     location.setKeyInfoId(opt.get().getKeyInfoId());
+                    location.setSchedulingId(opt.get().getId());
                 }
             }
             if (Objects.nonNull(keyInfos)) {
+package com.ruoyi.domain.caiinfo;
+
+import lombok.Data;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.apache.commons.lang3.StringUtils;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+import com.ruoyi.common.annotation.Excel;
+
+
+@Data
+@Slf4j
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("car_info")
+/**车辆信息 实体*/
+public class LingangCarInfo {
+    /***ID*/
+    @TableId(value = "id", type = IdType.AUTO)
+    @Excel(name = "ID")
+    private Integer id;
+
+
+    /***车牌号*/
+    @Excel(name = "车牌号")
+    private String plateNum;
+
+
+    /***车位号*/
+    @Excel(name = "车位号")
+    private String parkingNo;
+
+
+    /***车辆状态：1为正常车，0为维修车，2为故障车*/
+    @Excel(name = "车辆状态：1为正常车，0为维修车，2为故障车")
+    private Integer status;
+
+
+    /***创建人员*/
+    @Excel(name = "创建人员")
+    private String createBy;
+
+
+    /***创建时间*/
+    @Excel(name = "创建时间")
+    private java.util.Date createTime;
+
+
+    /***修改人员*/
+    @Excel(name = "修改人员")
+    private String updateBy;
+
+
+    /***修改时间*/
+    @Excel(name = "修改时间")
+    private java.util.Date updateTime;
+
+
+    /***车辆自编号*/
+    @Excel(name = "车辆自编号")
+    private String nbbm;
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.caiinfo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value = "车辆信息的添加DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**车辆信息 DTO*/
+public class LingangCarInfoAddDTO implements java.io.Serializable {
+    private static final long serialVersionUID = 425294388L;
+
+    /***ID*/
+    @ApiModelProperty(value = "ID", example = "1")
+    private Integer id;
+    /***车牌号*/
+    @ApiModelProperty(value = "车牌号")
+    private String plateNum;
+    /***车位号*/
+    @ApiModelProperty(value = "车位号")
+    private String parkingNo;
+    /***车辆状态：1为正常车，0为维修车，2为故障车*/
+    @ApiModelProperty(value = "车辆状态：1为正常车，0为维修车，2为故障车", example = "1")
+    private Integer status;
+    /***创建人员*/
+    @ApiModelProperty(value = "创建人员")
+    private String createBy;
+    /***创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+    /***修改人员*/
+    @ApiModelProperty(value = "修改人员")
+    private String updateBy;
+    /***修改时间*/
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+    /***车辆自编号*/
+    @ApiModelProperty(value = "车辆自编号")
+    private String nbbm;
+    /***操作人员*/
+    @ApiModelProperty(value = "操作人员")
+    private String operator;
+
+
+    public void clearStrEmpty() {
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.plateNum)) {
+            this.plateNum = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.parkingNo)) {
+            this.parkingNo = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)) {
+            this.createBy = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)) {
+            this.updateBy = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.nbbm)) {
+            this.nbbm = null;
+        }
+        if (org.apache.commons.lang3.StringUtils.isEmpty(this.operator)) {
+            this.operator = null;
+        }
+    }
+
+
+    @Override
+    public String toString() {
+        return com.alibaba.fastjson2.JSON.toJSONString(this);
+    }
+}
 \ No newline at end of file
+package com.ruoyi.domain.caiinfo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value="车辆信息的查询DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**车辆信息 DTO*/
+public class LingangCarInfoQueryDTO implements java.io.Serializable{
+    private static final long serialVersionUID = 494396122L;
+
+        /***ID*/
+            @ApiModelProperty(value="ID",example ="1")
+        private Integer id;
+        /***车牌号*/
+            @ApiModelProperty(value="车牌号")
+        private String plateNum;
+        /***车位号*/
+            @ApiModelProperty(value="车位号")
+        private String parkingNo;
+        /***车辆状态：1为正常车，0为维修车，2为故障车*/
+            @ApiModelProperty(value="车辆状态：1为正常车，0为维修车，2为故障车",example ="1")
+        private Integer status;
+        /***创建人员*/
+            @ApiModelProperty(value="创建人员")
+        private String createBy;
+        /***创建时间*/
+            @ApiModelProperty(value="创建时间")
+        private java.util.Date createTime;
+        /***修改人员*/
+            @ApiModelProperty(value="修改人员")
+        private String updateBy;
+        /***修改时间*/
+            @ApiModelProperty(value="修改时间")
+        private java.util.Date updateTime;
+        /***车辆自编号*/
+            @ApiModelProperty(value="车辆自编号")
+        private String nbbm;
+
+
+
+    public void clearStrEmpty(){
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.plateNum)){
+            this.plateNum = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.parkingNo)){
+            this.parkingNo = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)){
+            this.createBy = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)){
+            this.updateBy = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.nbbm)){
+            this.nbbm = null;
+            }
+    }
+
+
+
+     @Override
+     public String toString() {return com.alibaba.fastjson2.JSON.toJSONString(this);}
+}
 \ No newline at end of file
+package com.ruoyi.domain.caiinfo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@ApiModel(value="车辆信息的修改DTO")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+/**车辆信息 DTO*/
+public class LingangCarInfoUpdateDTO implements java.io.Serializable{
+    private static final long serialVersionUID = 966326136L;
+
+        /***ID*/
+            @ApiModelProperty(value="ID",example ="1")
+        private Integer id;
+        /***车牌号*/
+            @ApiModelProperty(value="车牌号")
+        private String plateNum;
+        /***车位号*/
+            @ApiModelProperty(value="车位号")
+        private String parkingNo;
+        /***车辆状态：1为正常车，0为维修车，2为故障车*/
+            @ApiModelProperty(value="车辆状态：1为正常车，0为维修车，2为故障车",example ="1")
+        private Integer status;
+        /***创建人员*/
+            @ApiModelProperty(value="创建人员")
+        private String createBy;
+        /***创建时间*/
+            @ApiModelProperty(value="创建时间")
+        private java.util.Date createTime;
+        /***修改人员*/
+            @ApiModelProperty(value="修改人员")
+        private String updateBy;
+        /***修改时间*/
+            @ApiModelProperty(value="修改时间")
+        private java.util.Date updateTime;
+        /***车辆自编号*/
+            @ApiModelProperty(value="车辆自编号")
+        private String nbbm;
+        /***操作人员*/
+            @ApiModelProperty(value="操作人员")
+        private String operator;
+
+
+
+    public void clearStrEmpty(){
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.plateNum)){
+            this.plateNum = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.parkingNo)){
+            this.parkingNo = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.createBy)){
+            this.createBy = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.updateBy)){
+            this.updateBy = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.nbbm)){
+            this.nbbm = null;
+            }
+            if(org.apache.commons.lang3.StringUtils.isEmpty(this.operator)){
+            this.operator = null;
+            }
+    }
+
+
+
+     @Override
+     public String toString() {return com.alibaba.fastjson2.JSON.toJSONString(this);}
+}
 \ No newline at end of file
@@ -21,7 +21,7 @@ import java.util.Set;
 import java.util.stream.Collectors;
 @Slf4j
-@Component("SignReportSummerJob")
+@Component("signReportSummerJob")
 public class SignReportSummerJob implements InitializingBean {
     @Autowired
     private SignReportServer signReportServer;
@@ -32,13 +32,14 @@ public class SignReportSummerJob implements InitializingBean {
         Date date = new Date();
         String dateStr = DateUtil.YYYY_MM_LINK.format(DateUtils.addDays(date, -1));
         List<SignReportGroupByVo> signReportGroupByVos = signReportServer.querySignReportGroupByDateStrVo(dateStr);
+        String dateStr1 = DateUtil.YYYY_MM_DD_LINK.format(DateUtils.addDays(date, -1));
         if (CollectionUtils.isNotEmpty(signReportGroupByVos)) {
-            List<SignReportGroupByVo> voList = signReportGroupByVos.stream().filter(s -> StringUtils.equals(s.getDateStr(), dateStr)).collect(Collectors.toList());
+            List<SignReportGroupByVo> voList = signReportGroupByVos.stream().filter(s -> StringUtils.equals(s.getDateStr(), dateStr1)).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(voList)) {
                 SignReportDaySummary summary = new SignReportDaySummary();
-                summary.setDatestr(dateStr);
+                summary.setDatestr(dateStr1);
                 List<SignReportDaySummary> summaries = signReportDaySummaryService.list(summary);
                 if (CollectionUtils.isNotEmpty(summaries)) {
+package com.ruoyi.mapper.carinfo;
+
+import com.ruoyi.domain.caiinfo.LingangCarInfo;
+import org.apache.ibatis.annotations.Mapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+@Mapper
+/**车辆信息 Mapper接口*/
+public interface LingangCarInfoMapper extends BaseMapper<LingangCarInfo> {
+    /**插入有值的列  */
+    int insertSelective(LingangCarInfo   carInfo);
+
+    int insertNotExit(LingangCarInfo carInfo);
+}
 \ No newline at end of file
@@ -10,5 +10,7 @@ public interface KeyInfoMapper extends BaseMapper&lt;KeyInfo&gt; {
     /**
      * 插入有值的列
      */
-    int insertSelective(KeyInfo name);
+    int insertSelective(KeyInfo entity);
+
+    int insertNotExists(KeyInfo entity);
 }
 \ No newline at end of file
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.Collection;
 import java.util.List;
@@ -16,4 +17,7 @@ public interface LinggangSchedulingMapper extends BaseMapper&lt;LinggangScheduling&gt;
     int insertSelective(LinggangScheduling name);
     List<LinggangScheduling>  listByCZ(LinggangScheduling entity);
+
+
+   Collection<String> listNbbmByEntity(LinggangScheduling entity);
 }
 \ No newline at end of file
@@ -35,6 +35,7 @@ import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.GlobalIndex;
 import com.ruoyi.pojo.response.ResponseSchedulingDto;
+import com.ruoyi.service.carinfo.LingangCarInfoService;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
@@ -136,6 +137,8 @@ public class ThreadJobService {
     private LinggangSchedulingService linggangSchedulingService;
     @Autowired
     private NewDriverService newDriverService;
+    @Autowired
+    private LingangCarInfoService lingangCarInfoService;
     @Value("${bsth.process.sign.url}")
     private String processSignExceptionURL;
@@ -606,6 +609,8 @@ public class ThreadJobService {
         }
         List<DriverScheduling> bcList = getBcList(originSchedulingMap, type);
+        lingangCarInfoService.insert(bcList);
+
         // 处理非司售人员的排班明细
         bcList.addAll(handleOtherPostsScheduling(type));
         // 插入排班
+package com.ruoyi.service.carinfo;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.LingangCarInfo;
+
+/**
+ * 车辆信息 Service接口
+ */
+public interface LingangCarInfoService extends IService<LingangCarInfo> {
+    /**
+     * 分页查询
+     */
+    IPage<LingangCarInfo> pageList(com.baomidou.mybatisplus.extension.plugins.pagination.Page<LingangCarInfo> page, LingangCarInfo entity, OrderEntity orderEntity);
+
+    /**
+     * 带条件查询
+     */
+    List<LingangCarInfo> list(LingangCarInfo entity);
+
+    // List<LingangCarInfo> listOfIds(java.util.Collection<java.lang.Integer> ids);
+    // /***
+    // *用于页面选择
+    // */
+    // List<LingangCarInfo> listOfSelect(LingangCarInfo entity);
+
+    /**
+     * 条件查询只返回一条数据的方法
+     */
+    LingangCarInfo getOne(LingangCarInfo entity);
+
+    Integer countId(LingangCarInfo entity);
+
+    /**
+     * 插入有值的列
+     */
+    int insertSelective(LingangCarInfo entity);
+
+    /***插入数据*/
+    boolean insert(LingangCarInfo entity);
+
+    boolean insert(List<DriverScheduling> bcList);
+
+    /**
+     * 根据主键修改数据
+     */
+    boolean updateByPrimaryKey(LingangCarInfo entity);
+
+    boolean deleteById(Integer id);
+}
 \ No newline at end of file
+package com.ruoyi.service.impl.carinfo;
+
+import com.ruoyi.domain.DriverScheduling;
+import com.ruoyi.domain.key.info.KeyInfo;
+import com.ruoyi.service.carinfo.LingangCarInfoService;
+import com.ruoyi.service.key.info.KeyInfoService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.LingangCarInfo;
+import com.ruoyi.mapper.carinfo.LingangCarInfoMapper;
+
+@Slf4j
+@Service
+/**车辆信息 Service实现类*/
+public class LingangCarInfoServiceImpl extends ServiceImpl<LingangCarInfoMapper, LingangCarInfo> implements LingangCarInfoService {
+    @Autowired
+    private LingangCarInfoMapper lingangCarInfoMapper;
+    @Autowired
+    private KeyInfoService keyInfoService;
+
+    /**
+     * 分页查询
+     */
+    @Override
+    public IPage<LingangCarInfo> pageList(Page<LingangCarInfo> page, LingangCarInfo entity, OrderEntity orderEntity) {
+        LambdaQueryWrapper<LingangCarInfo> countWrapper = new LambdaQueryWrapper<>(entity);
+        countWrapper.select(LingangCarInfo::getId);
+        int count = count(countWrapper);
+
+        List<LingangCarInfo> lists = Collections.emptyList();
+        if (count > 0) {
+            PageHelper.startPage((int) page.getCurrent(), (int) page.getSize(), false);
+            LambdaQueryWrapper<LingangCarInfo> selectWrapper = new LambdaQueryWrapper<>(entity);
+            orderColumn(selectWrapper, orderEntity);
+            lists = list(selectWrapper);
+        }
+
+        IPage<LingangCarInfo> returnPage = new Page<LingangCarInfo>();
+        returnPage.setRecords(lists);
+        returnPage.setPages(count % page.getSize() == 0 ? count / page.getSize() : count / page.getSize() + 1);
+        returnPage.setCurrent(page.getCurrent());
+        returnPage.setSize(page.getSize());
+        returnPage.setTotal(count);
+
+        return returnPage;
+    }
+
+    @Override
+    public List<LingangCarInfo> list(LingangCarInfo entity) {
+        return list(new LambdaQueryWrapper<>(entity));
+    }
+    // @Override
+    // public List<LingangCarInfo> listOfSelect(LingangCarInfo entity) {
+    //      LambdaQueryWrapper<LingangCarInfo> wrapper = new LambdaQueryWrapper<>(entity);
+    //     wrapper.select(LingangCarInfo::, LingangCarInfo::);
+    //      return list(wrapper);
+    //  }
+
+    // @Override
+    // public List<LingangCarInfo> listOfIds(java.util.Collection<java.lang.Integer> ids) {
+    //     if (org.springframework.util.CollectionUtils.isEmpty(ids)) {
+    //         return java.util.Collections.emptyList();
+    //    }
+    //   LambdaQueryWrapper<LingangCarInfo> wrapper = new LambdaQueryWrapper<>();
+    //   wrapper.select(LingangCarInfo::getId,LingangCarInfo::);
+    //   wrapper.in(LingangCarInfo::getId, ids);
+    //   return list(wrapper);
+    // }
+
+    @Override
+    public LingangCarInfo getOne(LingangCarInfo entity) {
+        return getOne(new LambdaQueryWrapper<>(entity));
+    }
+
+    @Override
+    public Integer countId(LingangCarInfo entity) {
+        LambdaQueryWrapper<LingangCarInfo> wrapper = new LambdaQueryWrapper<>(entity);
+        wrapper.select(LingangCarInfo::getId);
+        return count(wrapper);
+    }
+
+
+    /**
+     * 插入有值的列
+     */
+    @Override
+    public int insertSelective(LingangCarInfo entity) {
+        return lingangCarInfoMapper.insertSelective(entity);
+    }
+
+    /**
+     * 插入数据
+     */
+    @Override
+    public boolean insert(LingangCarInfo entity) {
+        return save(entity);
+    }
+
+    @Override
+    public boolean insert(List<DriverScheduling> bcList) {
+        if (CollectionUtils.isEmpty(bcList)) {
+            return Boolean.TRUE;
+        }
+        Set<String> nbbms = bcList.stream().map(DriverScheduling::getNbbm).collect(Collectors.toSet());
+        nbbms.stream().forEach(nbbm -> {
+            LingangCarInfo carInfo = new LingangCarInfo();
+            carInfo.setNbbm(nbbm);
+            carInfo.setStatus(1);
+
+            int count = lingangCarInfoMapper.insertNotExit(carInfo);
+            if (count > 0) {
+                log.info("添加车辆:[{}}", carInfo.getNbbm());
+            }
+
+            LambdaQueryWrapper<LingangCarInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(LingangCarInfo::getNbbm, nbbm);
+            carInfo = list(wrapper).get(0);
+
+            KeyInfo keyInfo = new KeyInfo();
+            keyInfo.setName("自编号为" + nbbm + "的车辆钥匙");
+            keyInfo.setDelFlag(Boolean.FALSE);
+            keyInfo.setPlateNum(carInfo.getPlateNum());
+            keyInfo.setNmmb(nbbm);
+            keyInfo.setKeyCode(nbbm + RandomUtils.nextInt(1, 100));
+            count = keyInfoService.insertNotExists(keyInfo);
+
+            if (count > 0) {
+                log.info("添加车辆钥匙:[{}}", carInfo.getNbbm());
+            }
+
+        });
+
+        return true;
+    }
+
+    /**
+     * 根据主键修改数据
+     */
+    @Override
+    public boolean updateByPrimaryKey(LingangCarInfo entity) {
+        return updateById(entity);
+    }
+
+    /***根据主键删除数据*/
+    @Override
+    public boolean deleteById(Integer id) {
+        return removeById(id);
+    }
+
+
+    public static void orderColumn(LambdaQueryWrapper<LingangCarInfo> wrapper, OrderEntity orderEntity) {
+        if (org.apache.commons.lang3.StringUtils.equals("ascending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByAsc(LingangCarInfo::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "plateNum")) {
+                wrapper.orderByAsc(LingangCarInfo::getPlateNum);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkingNo")) {
+                wrapper.orderByAsc(LingangCarInfo::getParkingNo);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "status")) {
+                wrapper.orderByAsc(LingangCarInfo::getStatus);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByAsc(LingangCarInfo::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
+                wrapper.orderByAsc(LingangCarInfo::getCreateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByAsc(LingangCarInfo::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByAsc(LingangCarInfo::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "nbbm")) {
+                wrapper.orderByAsc(LingangCarInfo::getNbbm);
+            }
+        } else if (org.apache.commons.lang3.StringUtils.equals("descending", orderEntity.getOrder())) {
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "id")) {
+                wrapper.orderByDesc(LingangCarInfo::getId);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "plateNum")) {
+                wrapper.orderByDesc(LingangCarInfo::getPlateNum);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "parkingNo")) {
+                wrapper.orderByDesc(LingangCarInfo::getParkingNo);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "status")) {
+                wrapper.orderByDesc(LingangCarInfo::getStatus);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createBy")) {
+                wrapper.orderByDesc(LingangCarInfo::getCreateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
+                wrapper.orderByDesc(LingangCarInfo::getCreateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateBy")) {
+                wrapper.orderByDesc(LingangCarInfo::getUpdateBy);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
+                wrapper.orderByDesc(LingangCarInfo::getUpdateTime);
+            }
+            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "nbbm")) {
+                wrapper.orderByDesc(LingangCarInfo::getNbbm);
+            }
+        } else {
+            wrapper.orderByDesc(LingangCarInfo::getId);
+        }
+    }
+}
 \ No newline at end of file
@@ -140,6 +140,11 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
         return KeyInfoMapper.insertSelective(entity);
     }
+    @Override
+    public int insertNotExists(KeyInfo entity) {
+        return KeyInfoMapper.insertNotExists(entity);
+    }
+
     /**
      * 插入数据
      */
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.lin.gang.LingangScheduling;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import com.ruoyi.mapper.scheduling.LinggangSchedulingMapper;
 import com.ruoyi.scheduling.domain.DriverSchedulingV1;
@@ -110,6 +111,11 @@ public class LinggangSchedulingServiceImpl extends ServiceImpl&lt;LinggangSchedulin
     }
     @Override
+    public  Collection<String> listNbbmByEntity(LinggangScheduling entity) {
+        return linggangSchedulingMapper.listNbbmByEntity(entity);
+    }
+
+    @Override
     public List<LinggangScheduling> listNbbm(LinggangScheduling entity, Collection<String> nbbm) {
         LambdaQueryWrapper<LinggangScheduling> wrapper = new LambdaQueryWrapper<>(entity);
         switchScheduleDate(wrapper, entity);
@@ -46,6 +46,7 @@ public interface KeyInfoService extends IService&lt;KeyInfo&gt; {
      * 插入有值的列
      */
     int insertSelective(KeyInfo entity);
+    int insertNotExists(KeyInfo entity);
     /***插入数据*/
     boolean insert(KeyInfo entity);
@@ -3,6 +3,7 @@ package com.ruoyi.service.scheduling;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.lin.gang.LingangScheduling;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
 import java.util.Collection;
@@ -29,6 +30,8 @@ public interface LinggangSchedulingService extends IService&lt;LinggangScheduling&gt; 
     List<LinggangScheduling> listByCZ(LinggangScheduling entity);
+    Collection<String> listNbbmByEntity(LinggangScheduling entity);
+
     List<LinggangScheduling>  listNbbm(LinggangScheduling entity,Collection<String> nbbm);
     List<LinggangScheduling> listByTime(LinggangScheduling entity);
@@ -57,7 +57,7 @@ public class SysDictDataController extends BaseController {
     /**
      * 查询字典数据详细
      */
-    @PreAuthorize("@ss.hasPermi('system:dict:query')")
+
     @GetMapping(value = "/{dictCode}")
     public AjaxResult getInfo(@PathVariable Long dictCode) {
         return success(dictDataService.selectDictDataById(dictCode));
@@ -5,9 +5,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.SysPermissionService;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,6 +39,8 @@ public class SysLoginController {
     @Autowired
     private SysPermissionService permissionService;
+    @Autowired
+    private TokenService tokenService;
     /**
      * 登录方法
@@ -48,13 +53,30 @@ public class SysLoginController {
     public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
         // 生成令牌
-        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
-                loginBody.getUuid());
+        String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), loginBody.getUuid());
         ajax.put(Constants.TOKEN, token);
         return ajax;
     }
     /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("getRouters")
+    public AjaxResult getRouters() {
+//        Long userId = SecurityUtils.getUserId();
+
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        // 用户信息
+        SysUser user = loginUser.getUser();
+
+        Long userId = user.getUserId();
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+        return AjaxResult.success(menuService.buildMenus(menus));
+    }
+
+    /**
      * 登录方法
      *
      * @param loginBody 登录信息
@@ -71,7 +93,6 @@ public class SysLoginController {
     }
-
     /**
      * 获取用户信息
      *
@@ -80,7 +101,9 @@ public class SysLoginController {
     @ApiOperation("获取用户信息")
     @GetMapping("getInfo")
     public AjaxResult getInfo() {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        SysUser user = loginUser.getUser();
+//        SysUser user = SecurityUtils.getLoginUser().getUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
@@ -92,16 +115,16 @@ public class SysLoginController {
         return ajax;
     }
-    /**
-     * 获取路由信息
-     *
-     * @return 路由信息
-     */
-    @ApiOperation("获取路由信息")
-    @GetMapping("getRouters")
-    public AjaxResult getRouters() {
-        Long userId = SecurityUtils.getUserId();
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return AjaxResult.success(menuService.buildMenus(menus));
-    }
+//    /**
+//     * 获取路由信息
+//     *
+//     * @return 路由信息
+//     */
+//    @ApiOperation("获取路由信息")
+//    @GetMapping("getRouters")
+//    public AjaxResult getRouters() {
+//        Long userId = SecurityUtils.getUserId();
+//        List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+//        return AjaxResult.success(menuService.buildMenus(menus));
+//    }
 }
+# 数据源配置
+spring:
+    # 邮箱配置
+    mail:
+        # 只发送不接收
+        host: smtp.163.com
+        # 自己的邮箱
+        username: m18980249160@163.com
+        # 提供的密码  不是自己的登录密码
+        password: RZHJXWXPCALIAOCG1
+        # 占用端口号
+        port: 465
+        nickname: 酒精测试异常通知
+        form: m18980249160@163.com
+        protocol: smtp
+        properties:
+            mail:
+                smtp:
+                    ssl:
+                        enable: true
+                    socketFactory:
+                        class: javax.net.ssl.SSLSocketFactory
+
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                # 测试地址
+                url: jdbc:mysql://10.10.200.172:3666/lingang_all_in_one1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
+                username: alcohol_sign
+                password: 6ZG5F&V@4rA(X=@#3
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url:
+                username:
+                password:
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: qpgj
+                login-password: 2023#manager@qpgjuse
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+        # 文件上传
+        servlet:
+            multipart:
+                # 单个文件大小
+                max-file-size: 100MB
+                # 设置总上传的文件大小
+                max-request-size: 100MB
+        # 服务模块
+        devtools:
+            restart:
+                # 热部署开关
+                enabled: false
+        # redis 配置
+    redis:
+        # 地址
+#            host: 121.41.83.61
+        host: 10.10.200.172
+        database: 4
+        password: 728926
+        port: 7829
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    # token配置
+    token:
+        # 令牌自定义标识
+        header: Authorization
+        # 令牌密钥
+        secret: abcdefghijklmnopqrstuvwxys
+        # 令牌有效期（默认30分钟）
+        expireTime: 30
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.8.5
+    # 版权年份
+    copyrightYear: 2023
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8102
+    servlet:
+        # 应用的访问路径
+        context-path: /
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: false
+    production: true
+    # 请求前缀
+    #  pathMapping: /dev-api
+    pathMapping: /
+springfox:
+    documentation:
+        auto-startup: false
+        enabled: false
+
+api:
+    template: 车队与线路匹配模板
+    url:
+        # all 为获取所有驾驶员信息
+        getDriverInfo: http://dsh.bdo2o.com:6280/shr
+        # 获取公司编码下的员工信息 暂时没用
+        getCompanyInfo:
+        # 获取排班信息
+        getSchedulingInfo: http://10.10.150.103:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://10.10.150.103:9089/webservice/rest/schedule_real/sch_jk4modify/%s/%s/%d?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew1: http://10.10.150.103:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoPlan: http://10.10.150.103:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+    config:
+        password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+        # 随机字符串
+        nonce: adfsad
+    apk:
+        path: /apk/dev
+    # 用户头像存放位置
+    headImage: /head/image
+    sign:
+        image: /image
+    video:
+        basePath: /video
+
+    personnel:
+        token:
+            tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+            appKey: dingsclwvxui5zilg1xk
+            appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
+        people:
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+    path: logs
+netty:
+    # 是否开启netty服务
+    enabled: false
+    socket:
+        # 相对路径 classpath
+        catalogue:
+            image: device/image
+            speech: device/speech
+        port: 8989
+bsth:
+    face:
+        app:
+            id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
+        sdk:
+            key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
+            # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
+        lib:
+            path: /opt/alcoholSign/lib/LINUX64
+            # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
+        faceFeature:
+            url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
+    process:
+        sign:
+            url: http://127.0.0.1:9103/commonOpenDataApi/sendAppAndSmsNotice
+
+# 数据源配置
+spring:
+    # 邮箱配置
+    mail:
+        # 只发送不接收
+        host: smtp.163.com
+        # 自己的邮箱
+        username: m18980249160@163.com
+        # 提供的密码  不是自己的登录密码
+        password: RZHJXWXPCALIAOCG1
+        # 占用端口号
+        port: 465
+        nickname: 酒精测试异常通知
+        form: m18980249160@163.com
+        protocol: smtp
+        properties:
+            mail:
+                smtp:
+                    ssl:
+                        enable: true
+                    socketFactory:
+                        class: javax.net.ssl.SSLSocketFactory
+
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+                # 测试地址
+                url: jdbc:mysql://10.10.200.172:3666/lingang_all_in_one1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
+                username: alcohol_sign
+                password: 6ZG5F&V@4rA(X=@#3
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url:
+                username:
+                password:
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter:
+                enabled: true
+            statViewServlet:
+                enabled: true
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: qpgj
+                login-password: 2023#manager@qpgjuse
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+        # 文件上传
+        servlet:
+            multipart:
+                # 单个文件大小
+                max-file-size: 100MB
+                # 设置总上传的文件大小
+                max-request-size: 100MB
+        # 服务模块
+        devtools:
+            restart:
+                # 热部署开关
+                enabled: false
+        # redis 配置
+    redis:
+        # 地址
+#            host: 121.41.83.61
+        host: 10.10.200.172
+        database: 4
+        password: 728926
+        port: 7829
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    # token配置
+    token:
+        # 令牌自定义标识
+        header: Authorization
+        # 令牌密钥
+        secret: abcdefghijklmnopqrstuvwxys
+        # 令牌有效期（默认30分钟）
+        expireTime: 30
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.8.5
+    # 版权年份
+    copyrightYear: 2023
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置E:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: /mnt/newdisk/alcoholSign/apache-tomcat/webapps/uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8106
+    servlet:
+        # 应用的访问路径
+        context-path: /alcoholApi
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # 连接数满后的排队数，默认为100
+        accept-count: 1000
+        threads:
+            # tomcat最大线程数，默认为200
+            max: 800
+            # Tomcat启动初始化的线程数，默认值10
+            min-spare: 100
+
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: false
+    production: true
+    # 请求前缀
+    #  pathMapping: /dev-api
+    pathMapping: /
+springfox:
+    documentation:
+        auto-startup: false
+        enabled: false
+
+api:
+    template: 车队与线路匹配模板
+    url:
+        # all 为获取所有驾驶员信息
+        getDriverInfo: http://dsh.bdo2o.com:6280/shr
+        # 获取公司编码下的员工信息 暂时没用
+        getCompanyInfo:
+        # 获取排班信息
+        getSchedulingInfo: http://10.10.150.103:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://10.10.150.103:9089/webservice/rest/schedule_real/sch_jk4modify/%s/%s/%d?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew1: http://10.10.150.103:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoPlan: http://10.10.150.103:9089/webservice/rest/schedule/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+    config:
+        password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+        # 随机字符串
+        nonce: adfsad
+    apk:
+        path: /apk/dev
+    # 用户头像存放位置
+    headImage: /head/image
+    sign:
+        image: /image
+    video:
+        basePath: /video
+
+    personnel:
+        token:
+            tokenUrl: https://api.dingtalk.com/v1.0/oauth2/accessToken
+            appKey: dingsclwvxui5zilg1xk
+            appSecret: ckV20k3jMKJpUkfXXSGhLk077rQQjsSaAusiSVY-nm4glwweCmb_SMJ62Cpf4YQ5
+        people:
+            url: https://api.dingtalk.com/v1.0/yida/forms/instances/search
+log:
+    path: logs
+netty:
+    # 是否开启netty服务
+    enabled: false
+    socket:
+        # 相对路径 classpath
+        catalogue:
+            image: device/image
+            speech: device/speech
+        port: 8989
+bsth:
+    face:
+        app:
+            id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
+        sdk:
+            key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
+            # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
+        lib:
+            path: /opt/LINUX64
+            # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
+        faceFeature:
+            url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
+    process:
+        sign:
+            url: http://127.0.0.1:9103/commonOpenDataApi/sendAppAndSmsNotice
+
+<?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.carinfo.LingangCarInfoMapper">
+    <resultMap id="BaseResultMap" type="com.ruoyi.domain.caiinfo.LingangCarInfo">
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="plate_Num" jdbcType="VARCHAR" property="plateNum"/>
+        <result column="parking_No" jdbcType="VARCHAR" property="parkingNo"/>
+        <result column="status" jdbcType="INTEGER" property="status"/>
+        <result column="create_By" jdbcType="VARCHAR" property="createBy"/>
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_by" jdbcType="VARCHAR" property="updateBy"/>
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="nbbm" jdbcType="VARCHAR" property="nbbm"/>
+    </resultMap>
+
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ruoyi.domain.caiinfo.LingangCarInfo">
+        INSERT INTO car_info <include refid="insertSelectiveColumn"></include>
+        <include refid="insertSelectiveValue"></include>
+    </insert>
+    <insert id="insertNotExit" parameterType="com.ruoyi.domain.caiinfo.LingangCarInfo">
+        INSERT INTO car_info(plate_Num,status,nbbm)
+        select #{nbbm} plate_Num,#{status} status,#{nbbm} nbbm  from(
+        select count(nbbm) c from car_info ci where ci.nbbm =#{nbbm}
+        )t where t.c=0
+    </insert>
+
+    <sql id="columns">
+        id , plate_Num , parking_No , status , create_By , create_time , update_by , update_time , nbbm
+    </sql>
+
+    <sql id="insert_columns">
+        id , plate_Num , parking_No , status , create_By , create_time , update_by , update_time , nbbm
+    </sql>
+
+    <sql id="insert_values">
+        #{id}, #{plateNum}, #{parkingNo}, #{status}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{nbbm}
+    </sql>
+
+    <sql id="insertSelectiveColumn">
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="null!=id">id,</if>
+            <if test="null!=plateNum">plate_Num,</if>
+            <if test="null!=parkingNo">parking_No,</if>
+            <if test="null!=status">status,</if>
+            <if test="null!=createBy">create_By,</if>
+            <if test="null!=createTime">create_time,</if>
+            <if test="null!=updateBy">update_by,</if>
+            <if test="null!=updateTime">update_time,</if>
+            <if test="null!=nbbm">nbbm,</if>
+        </trim>
+    </sql>
+
+    <sql id="insertSelectiveValue">
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="null!=id">#{id,jdbcType=INTEGER},</if>
+            <if test="null!=plateNum">#{plateNum,jdbcType=VARCHAR},</if>
+            <if test="null!=parkingNo">#{parkingNo,jdbcType=VARCHAR},</if>
+            <if test="null!=status">#{status,jdbcType=INTEGER},</if>
+            <if test="null!=createBy">#{createBy,jdbcType=VARCHAR},</if>
+            <if test="null!=createTime">#{createTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=updateBy">#{updateBy,jdbcType=VARCHAR},</if>
+            <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=nbbm">#{nbbm,jdbcType=VARCHAR},</if>
+        </trim>
+    </sql>
+
+    <sql id="updateByPrimaryKeySelectiveSql">
+        <set>
+            <if test="null!=id">id = #{id,jdbcType=INTEGER},</if>
+            <if test="null!=plateNum">plate_Num = #{plateNum,jdbcType=VARCHAR},</if>
+            <if test="null!=parkingNo">parking_No = #{parkingNo,jdbcType=VARCHAR},</if>
+            <if test="null!=status">status = #{status,jdbcType=INTEGER},</if>
+            <if test="null!=createBy">create_By = #{createBy,jdbcType=VARCHAR},</if>
+            <if test="null!=createTime">create_time = #{createTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=updateBy">update_by = #{updateBy,jdbcType=VARCHAR},</if>
+            <if test="null!=updateTime">update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=nbbm">nbbm = #{nbbm,jdbcType=VARCHAR},</if>
+        </set>
+    </sql>
+
+    <sql id="where">
+        <if test="null!=id">AND id = #{id,jdbcType=INTEGER},</if>
+        <if test="null!=plateNum">AND plate_Num = #{plateNum,jdbcType=VARCHAR},</if>
+        <if test="null!=parkingNo">AND parking_No = #{parkingNo,jdbcType=VARCHAR},</if>
+        <if test="null!=status">AND status = #{status,jdbcType=INTEGER},</if>
+        <if test="null!=createBy">AND create_By = #{createBy,jdbcType=VARCHAR},</if>
+        <if test="null!=createTime">AND create_time = #{createTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=updateBy">AND update_by = #{updateBy,jdbcType=VARCHAR},</if>
+        <if test="null!=updateTime">AND update_time = #{updateTime,jdbcType=TIMESTAMP},</if>
+        <if test="null!=nbbm">AND nbbm = #{nbbm,jdbcType=VARCHAR},</if>
+    </sql>
+</mapper>
 \ No newline at end of file
@@ -17,6 +17,13 @@
     <insert id="insertSelective" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.ruoyi.domain.key.info.KeyInfo">
         INSERT INTO key_info <include refid= "insertSelectiveColumn"></include> <include refid= "insertSelectiveValue"></include>
     </insert>
+    <insert id="insertNotExists" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.ruoyi.domain.key.info.KeyInfo">
+        insert into key_info(name,del_flag,plate_Num,key_code)
+        select CONCAT('自编号为',#{nmmb},'的车辆钥匙')  plate_Num,0 del_flag,#{plateNum} plate_Num,#{keyCode} key_code  from(
+        select count(plate_Num) c from key_info ki  where ki.plate_Num =#{plateNum}
+        )t where t.c=0
+
+    </insert>
     <sql id="columns">
         id   ,  name   ,  status   ,  del_flag   ,  create_By   ,  create_Time   ,  updateBy   ,  update_Time   ,  plate_Num   ,  key_code
@@ -49,6 +49,12 @@
         </where>
     </select>
+    <select id="listNbbmByEntity" resultType="java.lang.String">
+        select nbbm
+        from scheduling
+        WHERE scheduling_type = #{type} and (qdzcode = #{czCode} OR zdzcode = #{czCode}) and schedule_date BETWEEN #{startScheduleDate} and #{endScheduleDate}
+        group by nbbm
+    </select>
     <sql id="columns">
         id   ,  schedule_date   ,  line_name   ,  job_code   ,  name   ,  posts   ,  lp_name   ,  nbbm   ,  bc_type   ,  fcsj_t   ,  zdsj_t   ,  sign_in_id   ,  ex_type   ,  sign_time   ,  sign_type   ,  alcohol_flag   ,  alcohol_intake   ,  remark   ,  key_info_id   ,  upDown   ,  qdzCode   ,  qdzName   ,  zdzCode   ,  zdzName
@@ -62,6 +68,7 @@
         #{id},  #{scheduleDate},  #{lineName},  #{jobCode},  #{name},  #{posts},  #{lpName},  #{nbbm},  #{bcType},  #{fcsjT},  #{zdsjT},  #{signInId},  #{exType},  #{signTime},  #{signType},  #{alcoholFlag},  #{alcoholIntake},  #{remark},  #{keyInfoId},  #{updown},  #{qdzcode},  #{qdzname},  #{zdzcode},  #{zdzname}
     </sql>
+
     <sql id="insertSelectiveColumn">
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="null!=id">id,</if>
@@ -16,6 +16,25 @@
     </description>
     <dependencies>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.1</version>
+        </dependency>
         <!-- SpringBoot Web容器 -->
          <dependency>
 package com.ruoyi.framework.security.filter;
 import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
+import com.ruoyi.framework.security.util.HttpClientUtil;
+import com.ruoyi.framework.security.util.UsLogin;
+import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.SysUserRole;
+import com.ruoyi.system.mapper.SysRoleMapper;
+import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.service.ISysRoleService;
+import com.ruoyi.system.service.ISysUserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -22,8 +39,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 /**
  * token过滤器 验证token有效性
@@ -34,6 +50,16 @@ import java.util.UUID;
 public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     @Autowired
     private TokenService tokenService;
+    @Autowired
+    private SysPermissionService permissionService;
+    @Autowired
+    private ISysUserService sysUserService;
+    @Autowired
+    private ISysRoleService roleService;
+    @Autowired
+    private SysRoleMapper roleMapper;
+    @Autowired
+    private SysUserRoleMapper userRoleMapper;
     private final static String USER_ID_KEY = "userId";
     private final static String REQUEST_ID_KEY = "requestId";
@@ -44,8 +70,104 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {
         LoginUser loginUser = tokenService.getLoginUser(request);
-        String userId = Objects.isNull(loginUser) ? getRandomValue() : Convert.toStr(loginUser.getUserId());
-        putMDC(userId, getRandomValue());
+        String userId1 = Objects.isNull(loginUser) ? getRandomValue() : Convert.toStr(loginUser.getUserId());
+        putMDC(userId1, getRandomValue());
+
+//        if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
+//            tokenService.verifyToken(loginUser);
+//            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
+//            authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+//            SecurityContextHolder.getContext().setAuthentication(authenticationToken);
+//        }
+
+        Map<String, String[]> requestMap = request.getParameterMap();
+        logger.info("loginUser:"+Objects.isNull(loginUser)+";requestMap.containsKey(\"token\"):"+requestMap.containsKey("token"));
+        if (loginUser == null && requestMap.containsKey("token")) {
+            String token = requestMap.get("token")[0];
+            if(org.apache.commons.lang3.StringUtils.isEmpty(token) || org.apache.commons.lang3.StringUtils.equalsAnyIgnoreCase(token,"undefined")){
+                token = request.getHeader("Authorization");
+                if(token.startsWith("Bearer ")){
+                    token= org.apache.commons.lang3.StringUtils.substringAfter(token,"Bearer ");
+                }
+            }
+            String sysCode = "SYSUS019";
+            String url = "http://10.10.200.142:9112/prod-api/system/utilitySystem/checkToken";
+          //  String url = "http://58.247.254.118:9102/prod-api/system/utilitySystem/checkToken";
+            UsLogin usLogin = new UsLogin();
+            usLogin.setToken(token);
+            usLogin.setSysCode(sysCode);
+            String dataJsonStr = HttpClientUtil.httpRequest(url, "POST", usLogin);
+
+            logger.info("[" + url + "] return values:[" + dataJsonStr + "]");
+            if(org.apache.commons.lang3.StringUtils.isNotEmpty(dataJsonStr)) {
+                JSONObject jsonObject = JSON.parseObject(dataJsonStr);
+                String code = jsonObject.getString("code");
+                JSONObject dataJson = jsonObject.getJSONObject("data");
+                String resCode = dataJson.getString("code");
+                /**
+                 * 登陆校验失败
+                 */
+                if ("9999".equals(resCode) || "9998".equals(resCode)) {
+                    System.out.println(jsonObject.getString("msgUser"));
+                    return;
+                }
+
+                /**
+                 * 回调数据
+                 */
+                JSONObject resDataJson = dataJson.getJSONObject("data");
+                /**
+                 * 用户名
+                 */
+                String username = resDataJson.getString("userName");
+
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+                SysUser sysUser = sysUserService.selectUserByUserName(username);
+
+
+                /**
+                 * 角色列表更新 开始
+                 * 根据自己需求使用
+                 * 1.校验角色
+                 * 2.新增/更新角色
+                 * 3.更新用户角色表
+                 */
+                JSONArray data = resDataJson.getJSONArray("roleList");
+                List<SysRole> sysRoleList = data.toJavaList(SysRole.class);
+
+                List<SysUserRole> sysUserRoleList = new ArrayList<>();
+                Long userId = sysUser.getUserId();
+                for (SysRole sysRole : sysRoleList) {
+                    SysRole sysRoleSearch = new SysRole();
+                    sysRoleSearch.setRoleKey(sysRole.getRoleKey());
+                    SysRole roleRes = roleService.selectRoleByRoleKey(sysRoleSearch);
+                    if (roleRes == null) {
+                        sysRole.setMenuIds(new Long[0]);
+                        roleService.insertRole(sysRole);
+                        SysUserRole batchData = new SysUserRole();
+                        batchData.setUserId(userId);
+                        batchData.setRoleId(sysRole.getRoleId());
+                        sysUserRoleList.add(batchData);
+                    } else {
+                        sysRole.setRoleId(roleRes.getRoleId());
+                        roleMapper.updateRole(sysRole);
+                    }
+                }
+                userRoleMapper.batchUserRole(sysUserRoleList);
+                /**
+                 * 角色列表更新 结束
+                 */
+
+
+                loginUser = new LoginUser();
+                loginUser.setToken(token);
+                loginUser.setPermissions(permissionService.getMenuPermission(sysUser));
+                loginUser.setUser(sysUser);
+
+                tokenService.createUsToken(loginUser);
+            }
+        }
+
         if (StringUtils.isNotNull(loginUser) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
             tokenService.verifyToken(loginUser);
@@ -58,21 +180,21 @@ public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
     public static String validateDevice(String device) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if(Objects.isNull(loginUser)){
-            return  "没有登陆信息";
+        if (Objects.isNull(loginUser)) {
+            return "没有登陆信息";
         }
-        if(org.apache.commons.lang3.StringUtils.equals(device,Convert.toStr(loginUser.getDeviceId()))){
+        if (org.apache.commons.lang3.StringUtils.equals(device, Convert.toStr(loginUser.getDeviceId()))) {
             return null;
         }
         String authorization = null;
         HttpServletRequest request = getRequest();
-        if(Objects.nonNull(request)){
+        if (Objects.nonNull(request)) {
             authorization = request.getHeader("Authorization");
         }
-        LOGGER.warn("device:[{}],authorization：[{}],loginUser:[{}]",device,authorization,loginUser);
+        LOGGER.warn("device:[{}],authorization：[{}],loginUser:[{}]", device, authorization, loginUser);
         return "登陆的设备和token不匹配";
     }
+package com.ruoyi.framework.security.util;
+
+
+import com.alibaba.fastjson2.JSON;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.SimpleHttpConnectionManager;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.protocol.HTTP;
+import org.apache.http.util.EntityUtils;
+
+import java.io.*;
+import java.lang.reflect.Field;
+import java.net.ConnectException;
+import java.net.HttpURLConnection;
+import java.net.ProtocolException;
+import java.net.URL;
+import java.util.*;
+
+public class HttpClientUtil {
+
+    public static String post(String url, Map<String, String> params) {
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+        HttpPost post = postForm(url, params);
+        String body = null;
+        try {
+            CloseableHttpResponse response2 = httpclient.execute(post);
+            try {
+                HttpEntity entity2 = response2.getEntity();
+                body = EntityUtils.toString(entity2, "UTF-8");
+                EntityUtils.consume(entity2);
+            } finally {
+                response2.close();
+            }
+        } catch (ClientProtocolException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } finally {
+            try {
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+
+        return body;
+    }
+
+    public static String get(String url) {
+        CloseableHttpClient httpclient = HttpClients.createDefault();
+        HttpGet httpGet = new HttpGet(url);
+        String body = null;
+        try {
+            CloseableHttpResponse response1 = httpclient.execute(httpGet);
+            try {
+                HttpEntity entity1 = response1.getEntity();
+                String charset = EntityUtils.getContentCharSet(entity1);
+                body = EntityUtils.toString(entity1);
+                EntityUtils.consume(entity1);
+            } finally {
+                response1.close();
+            }
+        } catch (ClientProtocolException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } finally {
+            try {
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return body;
+    }
+
+
+    /**
+     * @param url
+     * @param params
+     * @return
+     */
+    private static HttpPost postForm(String url, Map<String, String> params) {
+
+        HttpPost httpost = new HttpPost(url);
+        List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+
+        Set<String> keySet = params.keySet();
+        for (String key : keySet) {
+            nvps.add(new BasicNameValuePair(key, params.get(key)));
+        }
+
+        try {
+            httpost.setEntity(new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        return httpost;
+    }
+
+    public static String post(String url, String inMessageXml) {
+
+        System.out.println("url..." + url);
+        System.out.println("inMessageXml..." + inMessageXml);
+        //创建httpclient工具对象
+        HttpClient client = new HttpClient();
+        //创建post请求方法     
+        PostMethod myPost = new PostMethod(url);
+        //设置请求超时时间     
+        client.setConnectionTimeout(3000 * 1000);
+        String responseString = null;
+        try {
+            //设置请求头部类型     
+            myPost.setRequestHeader("Content-Type", "text/xml");
+            myPost.setRequestHeader("charset", "utf-8");
+            //设置请求体，即xml文本内容，一种是直接获取xml内容字符串，一种是读取xml文件以流的形式     
+            myPost.setRequestEntity(new StringRequestEntity(inMessageXml, "text/xml", "utf-8"));
+            int statusCode = client.executeMethod(myPost);
+            //只有请求成功200了，才做处理  
+            if (statusCode == HttpStatus.SC_OK) {
+                InputStream inputStream = myPost.getResponseBodyAsStream();
+                BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, "utf-8"));
+                StringBuffer stringBuffer = new StringBuffer();
+                String str = "";
+                while ((str = br.readLine()) != null) {
+                    stringBuffer.append(str);
+                }
+                responseString = stringBuffer.toString();
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            myPost.releaseConnection();
+            ((SimpleHttpConnectionManager) client.getHttpConnectionManager()).shutdown();
+        }
+        return responseString;
+    }
+
+
+    public static String doPost(String url, Object data) {
+
+        String jsonData = JSON.toJSONString(data);
+        //String jsonData = JSONUtils.toJson(data);
+        System.out.println("url..." + url);
+        System.out.println("inMessageXml..." + data);
+
+        CloseableHttpClient httpclient = HttpClientBuilder.create().build();
+        HttpPost post = new HttpPost(url);
+        try {
+            StringEntity s = new StringEntity(jsonData, "utf-8");
+            s.setContentEncoding("UTF-8");
+            s.setContentType("application/json");//发送json数据需要设置contentType
+            post.setEntity(s);
+            HttpResponse res = httpclient.execute(post);
+            if (res.getStatusLine().getStatusCode() == HttpStatus.SC_OK) {
+                return EntityUtils.toString(res.getEntity());
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                httpclient.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return null;
+    }
+
+
+    /**
+     * HttpURLConnection方式 模拟Http Get请求
+     *
+     * @param urlStr   请求路径
+     * @param paramMap 请求参数
+     * @return
+     * @throws Exception
+     */
+    public static String get(String urlStr, Map<String, String> paramMap) throws Exception {
+        urlStr = urlStr + "?" + getParamString(paramMap);
+        HttpURLConnection conn = null;
+        try {
+            //创建URL对象
+            URL url = new URL(urlStr);
+            //获取URL连接
+            conn = (HttpURLConnection) url.openConnection();
+            //设置通用的请求属性
+            setHttpUrlConnection(conn, "GET");
+            //建立实际的连接
+            conn.connect();
+            //获取响应的内容
+            return readResponseContent(conn.getInputStream());
+        } finally {
+            if (null != conn)
+                conn.disconnect();
+        }
+    }
+
+
+    /**
+     * HttpURLConnection方式 模拟Http Post请求
+     *
+     * @param urlStr 请求路径
+     * @return
+     * @throws Exception
+     */
+    public static String postMap(String urlStr, Object object) throws Exception {
+        HttpURLConnection conn = null;
+        PrintWriter writer = null;
+
+        try {
+            //创建URL对象
+            URL url = new URL(urlStr);
+            //获取请求参数
+            Map<String, String> params = objectToMap(object);
+            String param = getParamString(params);
+            //获取URL连接
+            System.out.println("requestUrl:" + urlStr);
+            System.out.println("outputStr:" + param);
+            conn = (HttpURLConnection) url.openConnection();
+            //设置通用请求属性
+            setHttpUrlConnection(conn, "POST");
+            //建立实际的连接
+            conn.connect();
+            //将请求参数写入请求字符流中
+            writer = new PrintWriter(conn.getOutputStream());
+            writer.print(param);
+            writer.flush();
+            //读取响应的内容
+            return readResponseContent(conn.getInputStream());
+        } finally {
+            if (null != conn)
+                conn.disconnect();
+            if (null != writer)
+                writer.close();
+        }
+    }
+
+    /**
+     * HttpURLConnection方式 模拟Http Post请求
+     *
+     * @param urlStr 请求路径
+     * @return
+     * @throws Exception
+     */
+    public static String postByMap(String urlStr, Map<String, String> params) throws Exception {
+        HttpURLConnection conn = null;
+        PrintWriter writer = null;
+
+        try {
+            //创建URL对象
+            URL url = new URL(urlStr);
+            //获取请求参数
+            String param = getParamString(params);
+            //获取URL连接
+            System.out.println("requestUrl:" + urlStr);
+            System.out.println("outputStr:" + param);
+            conn = (HttpURLConnection) url.openConnection();
+            //设置通用请求属性
+            setHttpUrlConnection(conn, "POST");
+            //建立实际的连接
+            conn.connect();
+            //将请求参数写入请求字符流中
+            writer = new PrintWriter(conn.getOutputStream());
+            writer.print(param);
+            writer.flush();
+            //读取响应的内容
+            return readResponseContent(conn.getInputStream());
+        } finally {
+            if (null != conn)
+                conn.disconnect();
+            if (null != writer)
+                writer.close();
+        }
+    }
+
+
+    /**
+     * 转换对象为map
+     *
+     * @param object
+     * @param ignore
+     * @return
+     */
+    public static Map<String, String> objectToMap(Object object, String... ignore) {
+        Map<String, String> tempMap = new LinkedHashMap<String, String>();
+        //获取本类的Fields
+        for (Field f : object.getClass().getDeclaredFields()) {
+            if (!f.isAccessible()) {
+                f.setAccessible(true);
+            }
+            boolean ig = false;
+            if (ignore != null && ignore.length > 0) {
+                for (String i : ignore) {
+                    if (i.equals(f.getName())) {
+                        ig = true;
+                        break;
+                    }
+                }
+            }
+            if (ig) {
+                continue;
+            } else {
+                Object o = null;
+                try {
+                    o = f.get(object);
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                tempMap.put(f.getName(), o == null ? "" : o.toString());
+            }
+        }
+        //获取基类的Fields
+        for (Field f : object.getClass().getFields()) {
+            if (!f.isAccessible()) {
+                f.setAccessible(true);
+            }
+            boolean ig = false;
+            if (ignore != null && ignore.length > 0) {
+                for (String i : ignore) {
+                    if (i.equals(f.getName())) {
+                        ig = true;
+                        break;
+                    }
+                }
+            }
+            if (ig) {
+                continue;
+            } else {
+                Object o = null;
+                try {
+                    o = f.get(object);
+                } catch (IllegalArgumentException e) {
+                    e.printStackTrace();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                tempMap.put(f.getName(), o == null ? "" : o.toString());
+            }
+        }
+        return tempMap;
+    }
+
+    /**
+     * 将参数转为路径字符串
+     *
+     * @param paramMap 参数
+     * @return
+     */
+    private static String getParamString(Map<String, String> paramMap) {
+        if (null == paramMap || paramMap.isEmpty()) {
+            return "";
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String key : paramMap.keySet()) {
+            if (!key.equals("pd")) {
+                if (StringUtils.isNotEmpty(paramMap.get(key))) {
+                    //传入值不为空 拼接字符串
+                    builder.append("&").append(key).append("=").append(paramMap.get(key));
+                } else {
+                    builder.append("&");
+                }
+            }
+
+        }
+        return new String(builder.deleteCharAt(0).toString());
+    }
+
+
+    /**
+     * 读取响应字节流并将之转为字符串
+     *
+     * @param in 要读取的字节流
+     * @return
+     * @throws IOException
+     */
+    private static String readResponseContent(InputStream in) throws IOException {
+        Reader reader = null;
+        StringBuilder content = new StringBuilder();
+        try {
+            reader = new InputStreamReader(in, "utf-8");
+            char[] buffer = new char[1024];
+            int head = 0;
+            while ((head = reader.read(buffer)) > 0) {
+                content.append(new String(buffer, 0, head));
+            }
+            String result = content.toString();
+            System.out.println("readResponseContent.." + result);
+            return result;
+        } finally {
+            if (null != in) {
+                in.close();
+            }
+            if (null != reader) {
+                reader.close();
+            }
+        }
+    }
+
+    /**
+     * 设置Http连接属性
+     *
+     * @param conn http连接
+     * @return
+     * @throws ProtocolException
+     * @throws Exception
+     */
+    private static void setHttpUrlConnection(HttpURLConnection conn,
+                                             String requestMethod) throws ProtocolException {
+        conn.setRequestMethod(requestMethod);
+        conn.setRequestProperty("content-encoding", "UTF-8");
+        conn.setRequestProperty("accept", "application/json");
+        conn.setRequestProperty("Accept-Charset", "UTF-8");
+        conn.setRequestProperty("Accept-Language", "zh-CN");
+
+        conn.setRequestProperty("User-Agent",
+                "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0)");
+        conn.setRequestProperty("Proxy-Connection", "Keep-Alive");
+
+        if (null != requestMethod && "POST".equals(requestMethod)) {
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+        }
+    }
+
+
+    /**
+     * 新http请求
+     *
+     * @param requestUrl
+     * @param requestMethod
+     * @param object
+     * @return
+     */
+    public static String httpRequest(String requestUrl, String requestMethod, Object object) {
+        //获取请求参数
+        Map<String, String> params = objectToMap(object);
+        String outputStr = getParamString(params);
+        System.out.println("requestUrl:" + requestUrl);
+        System.out.println("outputStr:" + outputStr);
+        StringBuffer buffer = new StringBuffer();
+        try {
+            URL url = new URL(requestUrl);
+            HttpURLConnection httpUrlConn = (HttpURLConnection) url.openConnection();
+            httpUrlConn.setDoOutput(true);
+            httpUrlConn.setDoInput(true);
+            httpUrlConn.setUseCaches(false);
+            httpUrlConn.setConnectTimeout(15000);
+            httpUrlConn.setReadTimeout(15000);
+            // 设置请求方式（GET/POST）
+            httpUrlConn.setRequestMethod(requestMethod);
+            httpUrlConn.connect();
+            // 当有数据需要提交时
+            if (null != outputStr) {
+                OutputStream outputStream = httpUrlConn.getOutputStream();
+                // 注意编码格式，防止中文乱码
+                outputStream.write(outputStr.getBytes("UTF-8"));
+                outputStream.close();
+            }
+            // 将返回的输入流转换成字符串
+            InputStream inputStream = httpUrlConn.getInputStream();
+            InputStreamReader inputStreamReader = new InputStreamReader(inputStream, "utf-8");
+            BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+
+            String str = null;
+            while ((str = bufferedReader.readLine()) != null) {
+                buffer.append(str);
+            }
+            bufferedReader.close();
+            inputStreamReader.close();
+            // 释放资源
+            inputStream.close();
+            inputStream = null;
+            httpUrlConn.disconnect();
+        } catch (ConnectException ce) {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        System.out.println("返回：" + buffer.toString());
+        return buffer.toString();
+    }
+
+
+}
+package com.ruoyi.framework.security.util;
+
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 岗位表 sys_post
+ *
+ * @author bsth
+ */
+public class UsLogin extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String token;
+
+    private String sysCode;
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+
+    public String getSysCode() {
+        return sysCode;
+    }
+
+    public void setSysCode(String sysCode) {
+        this.sysCode = sysCode;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("token", getToken())
+                .append("sysCode", getSysCode())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
+    }
+}
@@ -58,6 +58,22 @@ public class TokenService {
     @Autowired
     private RedisCache redisCache;
+    public String createUsToken(LoginUser loginUser)
+    {
+        String tokenLong = loginUser.getToken();
+        Claims claimsGet = parseToken(tokenLong);
+        // 解析对应的权限以及用户信息
+        String token = (String) claimsGet.get(Constants.LOGIN_USER_KEY);
+        loginUser.setToken(token);
+        setUserAgent(loginUser);
+        refreshToken(loginUser);
+
+        Map<String, Object> claims = new HashMap<>();
+        claims.put(Constants.LOGIN_USER_KEY, token);
+        return createToken(claims);
+    }
+
+
     /**
      * 获取用户身份信息
      *
@@ -183,6 +199,7 @@ public class TokenService {
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
         redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+        //setLoginUser(loginUser);
     }
     /**
@@ -49,6 +49,8 @@ public interface SysRoleMapper
      */
     public SysRole selectRoleById(Long roleId);
+    SysRole selectRoleByRoleKey(SysRole sysRole);
+
     /**
      * 根据用户ID查询角色
      * 
@@ -59,6 +59,8 @@ public interface ISysRoleService
      */
     public SysRole selectRoleById(Long roleId);
+    SysRole selectRoleByRoleKey(SysRole sysRole);
+
     /**
      * 校验角色名称是否唯一
      * 
@@ -139,6 +139,11 @@ public class SysRoleServiceImpl implements ISysRoleService
         return roleMapper.selectRoleById(roleId);
     }
+    @Override
+    public SysRole selectRoleByRoleKey(SysRole sysRole) {
+        return roleMapper.selectRoleByRoleKey(sysRole);
+    }
+
     /**
      * 校验角色名称是否唯一
      * 
@@ -92,8 +92,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 		<include refid="selectRoleVo"/>
 		 where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
 	</select>
-	
- 	<insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
+    <select id="selectRoleByRoleKey" parameterType="SysRole" resultMap="SysRoleResult">
+		<include refid="selectRoleVo"/>
+		where r.del_flag = '0'
+		<if test="roleKey != null and roleKey != ''">
+			AND r.role_key = #{roleKey}
+		</if>
+	</select>
+
+    <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
  		insert into sys_role(
  			<if test="roleId != null and roleId != 0">role_id,</if>
  			<if test="roleName != null and roleName != ''">role_name,</if>