蓝斯对接和前端页面

liujun001
1 parent 0b3b7f57
Showing 17 changed files with 339 additions and 183 deletions
Bsth-admin/src/main/java/com/ruoyi/config/FaceEngineConfig.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssEquipmentController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/key/info/KeyInfoController.java
Bsth-admin/src/main/java/com/ruoyi/domain/enums/DelFlagEnum.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/KeyInfo.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/dto/KeyInfoQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/vo/KeyInfoVO.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/KeyBoxVoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/key/info/KeyInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-admin/src/main/resources/logback.xml
Bsth-admin/src/main/resources/mapper/key/info/KeyInfoMapper.xml
Bsth-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java
Bsth-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
@@ -32,14 +32,14 @@ public class FaceEngineConfig {
         int errorCode = faceEngine.activeOnline(bsthSystemConfig.getFaceAppId(), bsthSystemConfig.getFaceSdkKey());
         if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
-            throw new InterruptException("引擎激活失败");
+            throw new InterruptException("引擎激活失败,错误编码:"+errorCode);
         }
         ActiveFileInfo activeFileInfo = new ActiveFileInfo();
         errorCode = faceEngine.getActiveFileInfo(activeFileInfo);
         if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
-            throw new InterruptException("获取激活文件信息失败");
+            throw new InterruptException("获取激活文件信息失败,错误编码:"+errorCode);
         }
         //引擎配置
@@ -64,7 +64,7 @@ public class FaceEngineConfig {
         errorCode = faceEngine.init(engineConfiguration);
         if (errorCode != ErrorInfo.MOK.getValue()) {
-            throw new InterruptException("初始化引擎失败");
+            throw new InterruptException("初始化引擎失败,错误编码:"+errorCode);
         }
         return faceEngine;
@@ -274,7 +274,7 @@ public class DssDriverController extends BaseController {
         int healThCheck = 0;
         SysDictData dictData = querySystData(newDriver.getPosts(), "healthCheck");
-        if (Objects.nonNull(dictData) && StringUtils.isNotEmpty(dictData.getDictValue())) {
+        if (Objects.nonNull(dictData) && Objects.nonNull(dictData.getDictValue())) {
             healThCheck = Convert.toInt(dictData.getDictValue());
         }
@@ -188,25 +188,25 @@ public class DssEquipmentController extends BaseController {
         EquimentAddressParamVo equimentAddressParamVo = new EquimentAddressParamVo();
         for (SysDictData sysDictData : sysDictDatas) {
-            if (Objects.equals(sysDictData.getDictType(), "drinking") && StringUtils.isNotEmpty(sysDictData.getDictValue())) {
+            if (Objects.equals(sysDictData.getDictType(), "drinking") && Objects.nonNull(sysDictData.getDictValue())) {
                 configVo.setDrinking(Convert.toBigDecimal(sysDictData.getDictValue()));
-            } else if (Objects.equals(sysDictData.getDictType(), "drunkenness") && StringUtils.isNotEmpty(sysDictData.getDictValue())) {
+            } else if (Objects.equals(sysDictData.getDictType(), "drunkenness") && Objects.nonNull(sysDictData.getDictValue())) {
                 configVo.setDrunkenness(Convert.toBigDecimal(sysDictData.getDictValue()));
-            } else if (Objects.equals(sysDictData.getDictType(), "videoParam") && StringUtils.isNotEmpty(sysDictData.getDictValue())) {
+            } else if (Objects.equals(sysDictData.getDictType(), "videoParam") && Objects.nonNull(sysDictData.getDictValue())) {
                 if (StringUtils.equals(sysDictData.getDiscKey(), "upflag")) {
                     equimentVideoParamVo.setUpflag(Convert.toInt(sysDictData.getDictValue()));
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "timespan")) {
                     equimentVideoParamVo.setTimespan(Convert.toInt(sysDictData.getDictValue()));
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "url")) {
-                    equimentVideoParamVo.setUrl(sysDictData.getDictValue());
+                    equimentVideoParamVo.setUrl(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "saveday")) {
                     equimentVideoParamVo.setSaveday(Convert.toInt(sysDictData.getDictValue()));
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "videoTimeSlot")) {
-                    equimentVideoParamVo.setVideoTimeSlot(sysDictData.getDictValue());
+                    equimentVideoParamVo.setVideoTimeSlot(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
                 }
-            } else if (Objects.equals(sysDictData.getDictType(), "addressParam") && StringUtils.isNotEmpty(sysDictData.getDictValue())) {
+            } else if (Objects.equals(sysDictData.getDictType(), "addressParam") && Objects.nonNull(sysDictData.getDictValue())) {
                 if (StringUtils.equals(sysDictData.getDiscKey(), "upgradeAddress")) {
-                    equimentAddressParamVo.setUpgradeAddress(sysDictData.getDictValue());
+                    equimentAddressParamVo.setUpgradeAddress(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "integer")) {
                     equimentAddressParamVo.setInteger(Convert.toInt(sysDictData.getDictValue()));
                 }
@@ -423,7 +423,6 @@ public class KeyBoxController extends BaseController {
     private WorkPlateV2Vo convertWorkPlateV2Vo(LinggangScheduling scheduling, LinggangKeyWorkLocation workLocation, KeyInfo keyInfo, CarInfo carInfo) {
         WorkPlateV2Vo vo = new WorkPlateV2Vo();
-        vo.setYardId(Convert.toStr(keyInfo.getYardId()));
 //        vo.setYardName(keyInfo.getY)
         vo.setDevice(workLocation.getDevice());
         vo.setCabinetNo(workLocation.getCabinetNo());
@@ -12,11 +12,9 @@ import com.ruoyi.domain.key.info.dto.KeyInfoQueryDTO;
 import com.ruoyi.domain.key.info.dto.KeyInfoUpdateDTO;
 import com.ruoyi.domain.key.info.dto.KeyInfoUpdateStatusDTO;
 import com.ruoyi.domain.key.info.vo.KeyInfoVO;
-import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,10 +22,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
 @RestController
@@ -46,20 +40,6 @@ public class KeyInfoController {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
         IPage<KeyInfo> response = KeyInfoService.pageList(new Page<KeyInfo>(page, pageLimit), entity,orderEntity);
-        if (CollectionUtils.isNotEmpty(response.getRecords())) {
-            Set<Integer> deviceIds = response.getRecords().stream().map(KeyInfo::getDeviceId).collect(Collectors.toSet());
-            List<Equipment> equipmentList = equipmentService.listNameAndIDByIds(deviceIds);
-            if (CollectionUtils.isNotEmpty(equipmentList)) {
-                List<KeyInfo> keyInfos = response.getRecords().stream().map(obj -> {
-                    Optional<Equipment> option = equipmentList.stream().filter(equ -> Objects.equals(equ.getId().intValue(), obj.getDeviceId().intValue())).findFirst();
-                    if (option.isPresent()) {
-                        obj.setDeviceLabel(option.get().getSiteName());
-                    }
-                    return obj;
-                }).collect(Collectors.toList());
-                response.setRecords(keyInfos);
-            }
-        }
         return JSON.toJSONString(convert(response));
     }
+package com.ruoyi.domain.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum DelFlagEnum {
+    YES(true,"已删除"),
+    NO(false,"未删除"),
+    ;
+    private Boolean value;
+    private String label;
+
+    DelFlagEnum(boolean value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+
+}
@@ -16,69 +16,49 @@ public class KeyInfo {
     /***ID*/
     @TableId(value = "id", type = IdType.AUTO)
     @Excel(name = "ID")
-    private Integer id;
+    private java.lang.Integer id;
     /***名称（如：XX车的钥匙）*/
-    @Excel(name = "名称")
-    private String name;
+    @Excel(name = "名称（如：XX车的钥匙）")
+    private java.lang.String name;
     /***状态*/
     @Excel(name = "状态")
-    private Integer status;
+    private java.lang.Integer status;
     /***是否删除*/
     @Excel(name = "是否删除")
-    private Boolean delFlag;
+    private java.lang.Boolean delFlag;
     /***创建人员*/
     @Excel(name = "创建人员")
-    @TableField(fill= FieldFill.INSERT)
-    private String createBy;
+    private java.lang.Integer createBy;
     /***创建时间*/
     @Excel(name = "创建时间")
-    @TableField(fill= FieldFill.INSERT)
     private java.util.Date createTime;
     /***修改人员*/
     @Excel(name = "修改人员")
-    @TableField(fill= FieldFill.UPDATE)
-    private String updateby;
+    private java.lang.Integer updateby;
     /***修改时间*/
     @Excel(name = "修改时间")
-    @TableField(fill= FieldFill.UPDATE)
     private java.util.Date updateTime;
-    /***钥匙所在场站ID*/
-    @Excel(name = "钥匙所在场站ID")
-    private Integer yardId;
-
-
-    /***钥匙锁在的设备ID*/
-    private Integer deviceId;
-
-    @Excel(name = "钥匙锁在的设备ID")
-    @TableField(exist = false)
-    private String deviceLabel;
-
-
-    /***钥匙所在的位置*/
-    @Excel(name = "钥匙所在的位置")
-    private Integer cabinetno;
-
     /***车牌号*/
     @Excel(name = "车牌号")
     private java.lang.String plateNum;
+
     /***钥匙编码*/
     @Excel(name = "钥匙编码")
     private java.lang.String keyCode;
@@ -56,6 +56,7 @@ public class KeyInfoQueryDTO  implements java.io.Serializable {
     @ApiModelProperty(value="钥匙编码")
     private java.lang.String keyCode;
+
     public void clearStrEmpty() {
         if (org.apache.commons.lang3.StringUtils.isEmpty(this.name)) {
             this.name = null;
 package com.ruoyi.domain.key.info.vo;
+import com.ruoyi.domain.enums.DelFlagEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import java.util.Objects;
+
 @Data
 @ApiModel(value = "钥匙信息的VO")
 @Accessors(chain = true)
@@ -58,6 +61,13 @@ public class KeyInfoVO implements java.io.Serializable {
     @ApiModelProperty(value = "钥匙编码")
     private java.lang.String keyCode;
+    public String getDelFlagStr() {
+        if (Objects.isNull(delFlag)) {
+            return null;
+        }
+        return delFlag ? DelFlagEnum.YES.getLabel() : DelFlagEnum.NO.getLabel();
+    }
+
     @Override
     public String toString() {
@@ -89,7 +89,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
             return ResponseResult.error(MessageFormat.format("工号[{0}]在[{1}]找不到车辆信息", request.getStaffCode(), request.getTime()));
         }
         KeyBoxVo keyBoxVo = new KeyBoxVo();
-        keyBoxVo.setCabinetNo(Convert.toStr(keyInfo.getCabinetno()));
+        //keyBoxVo.setCabinetNo(Convert.toStr(keyInfo.getCabinetno()));
 //        keyBoxVo.setDevice("");
         keyBoxVo.setDeviceName(equipment.getSiteName());
 //        keyBoxVo.setYardId(Convert.toStr(keyInfo.getYardId()));
@@ -138,15 +138,6 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
                 wrapper.orderByAsc(KeyInfo::getUpdateTime);
             }
-            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "yardId")) {
-                wrapper.orderByAsc(KeyInfo::getYardId);
-            }
-            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "deviceId")) {
-                wrapper.orderByAsc(KeyInfo::getDeviceId);
-            }
-            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "cabinetno")) {
-                wrapper.orderByAsc(KeyInfo::getCabinetno);
-            }
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "plateNum")) {
                 wrapper.orderByAsc(KeyInfo::getPlateNum);
             }
@@ -175,15 +166,7 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.key.info.Ke
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
                 wrapper.orderByDesc(KeyInfo::getUpdateTime);
             }
-            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "yardId")) {
-                wrapper.orderByDesc(KeyInfo::getYardId);
-            }
-            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "deviceId")) {
-                wrapper.orderByDesc(KeyInfo::getDeviceId);
-            }
-            if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "cabinetno")) {
-                wrapper.orderByDesc(KeyInfo::getCabinetno);
-            }
+           
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "plateNum")) {
                 wrapper.orderByDesc(KeyInfo::getPlateNum);
             }
 package com.ruoyi.web.controller.system;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.enums.DelFlagEnum;
 import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 /**
  * 数据字典信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
 @RequestMapping("/system/dict/data")
-public class SysDictDataController extends BaseController
-{
+public class SysDictDataController extends BaseController {
     @Autowired
     private ISysDictDataService dictDataService;
@@ -42,8 +39,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:list')")
     @GetMapping("/list")
-    public TableDataInfo list(SysDictData dictData)
-    {
+    public TableDataInfo list(SysDictData dictData) {
         startPage();
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         return getDataTable(list);
@@ -52,8 +48,7 @@ public class SysDictDataController extends BaseController
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @PreAuthorize("@ss.hasPermi('system:dict:export')")
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SysDictData dictData)
-    {
+    public void export(HttpServletResponse response, SysDictData dictData) {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
         ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
         util.exportExcel(response, list, "字典数据");
@@ -64,8 +59,7 @@ public class SysDictDataController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:dict:query')")
     @GetMapping(value = "/{dictCode}")
-    public AjaxResult getInfo(@PathVariable Long dictCode)
-    {
+    public AjaxResult getInfo(@PathVariable Long dictCode) {
         return success(dictDataService.selectDictDataById(dictCode));
     }
@@ -73,11 +67,9 @@ public class SysDictDataController extends BaseController
      * 根据字典类型查询字典数据信息
      */
     @GetMapping(value = "/type/{dictType}")
-    public AjaxResult dictType(@PathVariable String dictType)
-    {
+    public AjaxResult dictType(@PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
-        if (StringUtils.isNull(data))
-        {
+        if (StringUtils.isNull(data)) {
             data = new ArrayList<SysDictData>();
         }
         return success(data);
@@ -89,8 +81,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:add')")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult add(@Validated @RequestBody SysDictData dict) {
         dict.setCreateBy(getUsername());
         return toAjax(dictDataService.insertDictData(dict));
     }
@@ -101,8 +92,7 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:edit')")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@Validated @RequestBody SysDictData dict)
-    {
+    public AjaxResult edit(@Validated @RequestBody SysDictData dict) {
         dict.setUpdateBy(getUsername());
         return toAjax(dictDataService.updateDictData(dict));
     }
@@ -113,9 +103,21 @@ public class SysDictDataController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:dict:remove')")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @DeleteMapping("/{dictCodes}")
-    public AjaxResult remove(@PathVariable Long[] dictCodes)
-    {
+    public AjaxResult remove(@PathVariable Long[] dictCodes) {
         dictDataService.deleteDictDataByIds(dictCodes);
         return success();
     }
+
+    @GetMapping(value = "/type/del/flag")
+    public ResponseResult<List<SysDictData>> deleteFlags() {
+        List<SysDictData> dictDatas = Arrays.stream(DelFlagEnum.values()).map(d -> {
+            SysDictData sysDictData =new SysDictData();
+            sysDictData.setDictValue(d.getValue());
+            sysDictData.setDictLabel(d.getLabel());
+
+            return sysDictData;
+        }).collect(Collectors.toList());
+
+        return ResponseResult.success(dictDatas);
+    }
 }
+
+# 数据源配置
+spring:
+    # 邮箱配置
+    mail:
+        # 只发送不接收
+        host: smtp.163.com
+        # 自己的邮箱
+        username: m18980249160@163.com
+        # 提供的密码  不是自己的登录密码
+        password: RZHJXWXPCALIAOCG
+        # 占用端口号
+        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://localhost:3306/all-in-one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useAffectedRows=true&allowMultiQueries=true
+                #url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.124:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+               # url: jdbc:mysql://127.0.0.1:3306/lingang_all_in_one?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
+                password: guzijian
+               # password: 1
+            # 从库数据源
+            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: ruoyi
+                login-password: 123456
+            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: true
+        # redis 配置
+    redis:
+        # 地址
+#            host: 121.41.83.61
+        host: localhost
+        database: 2
+#            password: "guzijian"
+        port: 6379
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+    # token配置
+    token:
+        # 令牌自定义标识
+        header: Authorization
+        # 令牌密钥
+        secret: abcdefghijklmnopqrstuvwxyz
+        # 令牌有效期（默认30分钟）
+        expireTime: 30
+
+# 项目相关配置
+ruoyi:
+    # 名称
+    name: RuoYi
+    # 版本
+    version: 3.8.5
+    # 版权年份
+    copyrightYear: 2023
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+    profile: D:/ruoyi/uploadPath
+    # 获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数字计算 char 字符验证
+    captchaType: math
+mybatis-plus:
+    # 搜索指定包别名
+    typeAliasesPackage: com.ruoyi.**.domain
+    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+    mapperLocations: classpath*:mapper/**/*Mapper.xml
+    # 加载全局的配置文件
+    configLocation: classpath:mybatis/mybatis-config.xml
+# Swagger配置
+swagger:
+    # 是否开启swagger
+    enabled: true
+    # 请求前缀
+    #  pathMapping: /dev-api
+    pathMapping: /
+api:
+    template: 车队与线路匹配模板
+    url:
+        # all 为获取所有驾驶员信息
+        getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+        # 获取公司编码下的员工信息 暂时没用
+        getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+        # 获取排班信息
+        getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+    config:
+        password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
+        # 随机字符串
+        nonce: adfsad
+    apk:
+        path: /apk/dev
+    # 用户头像存放位置
+    headImage: /head/image
+
+    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
+server:
+    port: 8100
+netty:
+    # 是否开启netty服务
+    enabled: true
+    socket:
+        # 相对路径 classpath
+        catalogue:
+            image: device/image
+            speech: device/speech
+        port: 8989
+
+
+bsth:
+    upload:
+        image:
+            basePath: /head/image/upload
+        video:
+            basePath: /head/video/upload
+    face:
+        app:
+            id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
+        sdk:
+            # key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
+            key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
+        lib:
+            # path: /data/test/bath-alcoho-sign/LINUX64
+            path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-<!--	<property name="log.path" value="E:/ruoyi/logs" />-->
-<!--	<property name="log.path" value="D:/ruoyi/logs" />-->
-	<springProperty name="log.path" source="log.path" defaultValue="E:/ruoyi/logs" />
+	<springProperty name="log.path" source="log.path" defaultValue="d:/logs" />
     />
 <!--	<property name="log.path" value="/home/ruoyi/logs" />-->
     <!-- 日志输出格式 -->
@@ -2,52 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.mapper.key.info.KeyInfoMapper">
     <resultMap id="BaseResultMap" type="com.ruoyi.domain.key.info.KeyInfo">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="name" jdbcType="VARCHAR" property="name"/>
-        <result column="status" jdbcType="INTEGER" property="status"/>
-        <result column="del_flag" jdbcType="BIT" property="delFlag"/>
-        <result column="create_By" jdbcType="INTEGER" property="createBy"/>
-        <result column="create_Time" jdbcType="TIMESTAMP" property="createTime"/>
-        <result column="updateBy" jdbcType="INTEGER" property="updateby"/>
-        <result column="update_Time" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="yard_Id" jdbcType="INTEGER" property="yardId"/>
-        <result column="device_id" jdbcType="INTEGER" property="deviceId"/>
-        <result column="cabinetNo" jdbcType="INTEGER" property="cabinetno"/>
-        <result column="plate_Num" jdbcType="VARCHAR" property="plateNum"/>
-        <result column="key_code" jdbcType="VARCHAR" property="keyCode"/>
+        <id column ="id" jdbcType="INTEGER" property="id" />
+        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="status" jdbcType="INTEGER" property="status" />
+        <result column="del_flag" jdbcType="BIT" property="delFlag" />
+        <result column="create_By" jdbcType="INTEGER" property="createBy" />
+        <result column="create_Time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="updateBy" jdbcType="INTEGER" property="updateby" />
+        <result column="update_Time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="plate_Num" jdbcType="VARCHAR" property="plateNum" />
+        <result column="key_code" jdbcType="VARCHAR" property="keyCode" />
     </resultMap>
-    <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 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>
     <sql id="columns">
-        id
-        ,  name   ,  status   ,  del_flag   ,  create_By   ,  create_Time   ,  updateBy   ,  update_Time   ,  yard_Id   ,  device_id   ,  cabinetNo   ,  plate_Num   ,  key_code
+        id   ,  name   ,  status   ,  del_flag   ,  create_By   ,  create_Time   ,  updateBy   ,  update_Time   ,  plate_Num   ,  key_code
     </sql>
     <sql id="insert_columns">
-        id
-        ,  name  ,  status  ,  del_flag  ,  create_By  ,  create_Time  ,  updateBy  ,  update_Time  ,  yard_Id  ,  device_id  ,  cabinetNo  ,  plate_Num  ,  key_code
+        id  ,  name  ,  status  ,  del_flag  ,  create_By  ,  create_Time  ,  updateBy  ,  update_Time  ,  plate_Num  ,  key_code
     </sql>
     <sql id="insert_values">
-        #{id}
-        ,
-        #{name},
-        #{status},
-        #{delFlag},
-        #{createBy},
-        #{createTime},
-        #{updateby},
-        #{updateTime},
-        #{yardId},
-        #{deviceId},
-        #{cabinetno},
-        #{plateNum},
-        #{keyCode}
+        #{id},  #{name},  #{status},  #{delFlag},  #{createBy},  #{createTime},  #{updateby},  #{updateTime},  #{plateNum},  #{keyCode}
     </sql>
     <sql id="insertSelectiveColumn">
@@ -60,9 +40,6 @@
             <if test="null!=createTime">create_Time,</if>
             <if test="null!=updateby">updateBy,</if>
             <if test="null!=updateTime">update_Time,</if>
-            <if test="null!=yardId">yard_Id,</if>
-            <if test="null!=deviceId">device_id,</if>
-            <if test="null!=cabinetno">cabinetNo,</if>
             <if test="null!=plateNum">plate_Num,</if>
             <if test="null!=keyCode">key_code,</if>
         </trim>
@@ -78,9 +55,6 @@
             <if test="null!=createTime">#{createTime,jdbcType=TIMESTAMP},</if>
             <if test="null!=updateby">#{updateby,jdbcType=INTEGER},</if>
             <if test="null!=updateTime">#{updateTime,jdbcType=TIMESTAMP},</if>
-            <if test="null!=yardId">#{yardId,jdbcType=INTEGER},</if>
-            <if test="null!=deviceId">#{deviceId,jdbcType=INTEGER},</if>
-            <if test="null!=cabinetno">#{cabinetno,jdbcType=INTEGER},</if>
             <if test="null!=plateNum">#{plateNum,jdbcType=VARCHAR},</if>
             <if test="null!=keyCode">#{keyCode,jdbcType=VARCHAR},</if>
         </trim>
@@ -88,19 +62,16 @@
     <sql id="updateByPrimaryKeySelectiveSql">
         <set>
-            <if test="null!=id">id = #{id,jdbcType=INTEGER},</if>
-            <if test="null!=name">name = #{name,jdbcType=VARCHAR},</if>
-            <if test="null!=status">status = #{status,jdbcType=INTEGER},</if>
-            <if test="null!=delFlag">del_flag = #{delFlag,jdbcType=BIT},</if>
-            <if test="null!=createBy">create_By = #{createBy,jdbcType=INTEGER},</if>
-            <if test="null!=createTime">create_Time = #{createTime,jdbcType=TIMESTAMP},</if>
-            <if test="null!=updateby">updateBy = #{updateby,jdbcType=INTEGER},</if>
-            <if test="null!=updateTime">update_Time = #{updateTime,jdbcType=TIMESTAMP},</if>
-            <if test="null!=yardId">yard_Id = #{yardId,jdbcType=INTEGER},</if>
-            <if test="null!=deviceId">device_id = #{deviceId,jdbcType=INTEGER},</if>
-            <if test="null!=cabinetno">cabinetNo = #{cabinetno,jdbcType=INTEGER},</if>
-            <if test="null!=plateNum">plate_Num = #{plateNum,jdbcType=VARCHAR},</if>
-            <if test="null!=keyCode">key_code = #{keyCode,jdbcType=VARCHAR},</if>
+            <if test="null!=id"> id = #{id,jdbcType=INTEGER},</if>
+            <if test="null!=name"> name = #{name,jdbcType=VARCHAR},</if>
+            <if test="null!=status"> status = #{status,jdbcType=INTEGER},</if>
+            <if test="null!=delFlag"> del_flag = #{delFlag,jdbcType=BIT},</if>
+            <if test="null!=createBy"> create_By = #{createBy,jdbcType=INTEGER},</if>
+            <if test="null!=createTime"> create_Time = #{createTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=updateby"> updateBy = #{updateby,jdbcType=INTEGER},</if>
+            <if test="null!=updateTime"> update_Time = #{updateTime,jdbcType=TIMESTAMP},</if>
+            <if test="null!=plateNum"> plate_Num = #{plateNum,jdbcType=VARCHAR},</if>
+            <if test="null!=keyCode"> key_code = #{keyCode,jdbcType=VARCHAR},</if>
         </set>
     </sql>
@@ -113,9 +84,6 @@
         <if test="null!=createTime">AND create_Time = #{createTime,jdbcType=TIMESTAMP},</if>
         <if test="null!=updateby">AND updateBy = #{updateby,jdbcType=INTEGER},</if>
         <if test="null!=updateTime">AND update_Time = #{updateTime,jdbcType=TIMESTAMP},</if>
-        <if test="null!=yardId">AND yard_Id = #{yardId,jdbcType=INTEGER},</if>
-        <if test="null!=deviceId">AND device_id = #{deviceId,jdbcType=INTEGER},</if>
-        <if test="null!=cabinetno">AND cabinetNo = #{cabinetno,jdbcType=INTEGER},</if>
         <if test="null!=plateNum">AND plate_Num = #{plateNum,jdbcType=VARCHAR},</if>
         <if test="null!=keyCode">AND key_code = #{keyCode,jdbcType=VARCHAR},</if>
     </sql>
 package com.ruoyi.common.core.domain.entity;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 /**
  * 字典数据表 sys_dict_data
@@ -40,7 +40,7 @@ public class SysDictData extends BaseEntity {
      * 字典键值
      */
     @Excel(name = "字典键值")
-    private String dictValue;
+    private Object dictValue;
     /**
      * 字典类型
@@ -101,11 +101,11 @@ public class SysDictData extends BaseEntity {
     @NotBlank(message = "字典键值不能为空")
     @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符")
-    public String getDictValue() {
+    public Object getDictValue() {
         return dictValue;
     }
-    public void setDictValue(String dictValue) {
+    public void setDictValue(Object dictValue) {
         this.dictValue = dictValue;
     }
 package com.ruoyi.common.utils;
-import java.util.Collection;
-import java.util.List;
 import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.spring.SpringUtils;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
 /**
  * 字典工具类
  * 
@@ -147,7 +149,7 @@ public class DictUtils
             {
                 if (dictLabel.equals(dict.getDictLabel()))
                 {
-                    return dict.getDictValue();
+                    return Objects.isNull(dict.getDictValue())?null:dict.getDictValue().toString();
                 }
             }
         }