蓝斯接口

liujun001
1 parent 465954d0
Showing 51 changed files with 1458 additions and 477 deletions
Bsth-admin/src/main/java/com/ruoyi/config/BsthSystemConfig.java
Bsth-admin/src/main/java/com/ruoyi/controller/carinfo/CarInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/driver/NewDriverController.java
Bsth-admin/src/main/java/com/ruoyi/controller/driver/healthy/DriverHealthyController.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/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/controller/equipment/heartbeat/LingangEquipmentHeartbeatController.java
Bsth-admin/src/main/java/com/ruoyi/controller/equipment/self/check/LingangEquimentSelfCheckController.java
Bsth-admin/src/main/java/com/ruoyi/controller/keyinfo/KeyInfoController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/FaceCheckDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/vo/FaceCheckVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignHealthDataDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignOutDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignQuestionAnswerDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/dto/DssSignQuestionRecordDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/vo/DssSignHealthDataVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/vo/DssSignVo.java
+package com.ruoyi.config;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 9:32
+ */
+@Data
+@Component
+public class BsthSystemConfig {
+    @Value("${bsth.upload.image.basePath}")
+    private String imageBasePath;
+}
 package com.ruoyi.controller.carinfo;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.utils.poi.ExcelUtil;
 import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.caiinfo.CarInfo;
+import com.ruoyi.domain.caiinfo.dto.CarInfoAddDTO;
+import com.ruoyi.domain.caiinfo.dto.CarInfoQueryDTO;
+import com.ruoyi.domain.caiinfo.dto.CarInfoUpdateDTO;
+import com.ruoyi.domain.caiinfo.vo.CarInfoVO;
+import com.ruoyi.service.carinfo.CarInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.BeanUtils;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.alibaba.fastjson2.JSON;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.service.carinfo.CarInfoService;
-import com.ruoyi.domain.caiinfo.vo.CarInfoVO;
-import com.ruoyi.domain.caiinfo.dto.CarInfoAddDTO;
-import com.ruoyi.domain.caiinfo.dto.CarInfoUpdateDTO;
-import com.ruoyi.domain.caiinfo.dto.CarInfoQueryDTO;
-import com.ruoyi.domain.caiinfo.CarInfo;
-
 @RestController
 @RequestMapping("car/info")
 @Api(tags="车辆信息")
@@ -52,10 +43,10 @@ public class CarInfoController extends BaseController {
     @ApiOperation("根据ID查询详情")
     @GetMapping(value = "/view/{id}")
-    public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
+    public ResponseResult<CarInfoVO> view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
         CarInfo source = CarInfoService.getById(id);
-        return com.ruoyi.common.core.domain.AjaxResult.success(convert(source));
+        return ResponseResult.success(convert(source));
     }
@@ -72,15 +63,15 @@ public class CarInfoController extends BaseController {
     @PostMapping(value = "list/select")
     @ApiOperation("车辆列表（页面选择）")
-    public AjaxResult listSelect(CarInfoQueryDTO dto) {
+    public ResponseResult<List<CarInfoVO>> listSelect(CarInfoQueryDTO dto) {
         CarInfo entity = convert(dto);
         List<CarInfo> selectList = CarInfoService.listOfSelect(entity);
-        return AjaxResult.success(convert(selectList));
+        return ResponseResult.success(convert(selectList));
     }
     @GetMapping(value = "list/select/status")
     @ApiOperation("车辆状态选择列表（页面选择）")
-    public AjaxResult listSelect() {
+    public ResponseResult<List<Map<String,Object>>> listSelect() {
         List<Map<String,Object>> results = Arrays.stream(CarInfo.CarStatusEnum.values()).map(c->{
             Map<String,Object> map = new HashMap<>();
             map.put("label",c.getLabel());
@@ -88,37 +79,37 @@ public class CarInfoController extends BaseController {
             return map;
         }).collect(Collectors.toList());
-        return AjaxResult.success(results);
+        return ResponseResult.success(results);
     }
     @PreAuthorize("@ss.hasPermi('car:info:add')")
     @PostMapping(value = "/add")
     @ApiOperation("添加车辆信息")
-    public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute CarInfoAddDTO request) {
+    public ResponseResult add(@ModelAttribute CarInfoAddDTO request) {
         CarInfo entity = convert(request);
         entity.setCreateBy(getUserId());
         entity.setCreateTime(new Date());
         int count = CarInfoService.insertSelective(entity);
-        return count > 0 ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("添加数据失败，请稍后再试");
+        return count > 0 ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("添加数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('car:info:update')")
     @PostMapping(value = "/update")
     @ApiOperation("修改车辆信息")
-    public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute CarInfoUpdateDTO request) {
+    public ResponseResult update(@ModelAttribute CarInfoUpdateDTO request) {
         CarInfo entity = convert(request);
         entity.setUpdateBy(getUserId());
         entity.setUpdateTime(new Date());
         boolean flag = CarInfoService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("修改数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('car:info:del')")
     @GetMapping(value = "/del/{id}")
     @ApiOperation("删除车辆信息")
-    public com.ruoyi.common.core.domain.AjaxResult delById(@PathVariable("id") Integer id) {
+    public ResponseResult delById(@PathVariable("id") Integer id) {
         boolean flag = CarInfoService.deleteById(id);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("操作数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("操作数据失败，请稍后再试");
     }
     private CarInfo convert(CarInfoQueryDTO source) {
 package com.ruoyi.controller.driver;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.driver.dto.NewDriverAddDTO;
 import com.ruoyi.domain.driver.dto.NewDriverQueryDTO;
 import com.ruoyi.domain.driver.dto.NewDriverUpdateDTO;
 import com.ruoyi.domain.driver.vo.NewDriverVO;
+import com.ruoyi.service.driver.NewDriverService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.beans.BeanUtils;
-
+import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-
-
 @RestController
 @RequestMapping("new/driver")
 @Api(tags = "新-驾驶员信息")
 public class NewDriverController extends BaseController {
     @Autowired
-    private com.NewDriverService newDriverService;
+    private NewDriverService newDriverService;
     @PostMapping(value = "/list/select")
     @ApiOperation("（页面选择）")
-    public AjaxResult listSelect() {
+    public ResponseResult listSelect() {
         NewDriver entity = new NewDriver();
         List<NewDriver> selectList = newDriverService.listOfSelect(entity);
-        return AjaxResult.success(convert(selectList));
+        return ResponseResult.success(convert(selectList));
     }
     private NewDriver convert(NewDriverQueryDTO source) {
 package com.ruoyi.controller.driver.healthy;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.OrderEntity;
+import com.ruoyi.domain.driver.healthy.DriverHealthy;
+import com.ruoyi.domain.driver.healthy.dto.DriverHealthyAddDTO;
+import com.ruoyi.domain.driver.healthy.dto.DriverHealthyQueryDTO;
+import com.ruoyi.domain.driver.healthy.dto.DriverHealthyUpdateDTO;
+import com.ruoyi.domain.driver.healthy.dto.DriverHealthyUpdateStatusDTO;
+import com.ruoyi.domain.driver.healthy.vo.DriverHealthyVO;
+import com.ruoyi.service.driver.healthy.DriverHealthyService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.BeanUtils;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
-import com.ruoyi.domain.OrderEntity;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.alibaba.fastjson2.JSON;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
-
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.service.driver.healthy.DriverHealthyService;
-import com.ruoyi.domain.driver.healthy.vo.DriverHealthyVO;
-import com.ruoyi.domain.driver.healthy.dto.DriverHealthyAddDTO;
-import com.ruoyi.domain.driver.healthy.dto.DriverHealthyUpdateDTO;
-import com.ruoyi.domain.driver.healthy.dto.DriverHealthyUpdateStatusDTO;
-import com.ruoyi.domain.driver.healthy.dto.DriverHealthyQueryDTO;
-import com.ruoyi.domain.driver.healthy.DriverHealthy;
-
 @RestController
 @RequestMapping("driver/healthy")
 @Api(tags="驾驶员健康信息")
@@ -55,10 +46,10 @@ public class DriverHealthyController extends BaseController {
     @GetMapping(value = "/view/{id}")
     @ApiOperation("根据ID查看详情")
-    public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
+    public ResponseResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
         DriverHealthy source = driverHealthyService.getById(id);
-        return com.ruoyi.common.core.domain.AjaxResult.success(convert(source));
+        return ResponseResult.success(convert(source));
     }
@@ -76,35 +67,35 @@ public class DriverHealthyController extends BaseController {
     @PreAuthorize("@ss.hasPermi('driver:healthy:add')")
     @PostMapping(value = "/add")
     @ApiOperation("添加 ")
-    public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute DriverHealthyAddDTO request) {
+    public ResponseResult add(@ModelAttribute DriverHealthyAddDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
         entity.setCreateBy(getUserId());
         entity.setCreateTime(new Date());
         int count = driverHealthyService.insertSelective(entity);
-        return count > 0 ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("添加数据失败，请稍后再试");
+        return count > 0 ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("添加数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('driver:healthy:update')")
     @PostMapping(value = "/update")
     @ApiOperation("修改 ")
-    public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute DriverHealthyUpdateDTO request) {
+    public ResponseResult update(@ModelAttribute DriverHealthyUpdateDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
         entity.setUpdateBy(getUserId());
         entity.setUpdateTime(new Date());
         boolean flag = driverHealthyService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("修改数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('driver:healthy:update:status')")
     @PostMapping(value = "/update/status")
     @ApiOperation("修改状态 ")
-    public com.ruoyi.common.core.domain.AjaxResult updateState(@ModelAttribute DriverHealthyUpdateStatusDTO request) {
+    public ResponseResult updateState(@ModelAttribute DriverHealthyUpdateStatusDTO request) {
         request.clearStrEmpty();
         DriverHealthy entity = convert(request);
         boolean flag = driverHealthyService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("修改数据失败，请稍后再试");
     }
     private DriverHealthy convert(DriverHealthyQueryDTO source) {
 package com.ruoyi.controller.dss;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.system.UserInfo;
 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.exception.file.FileUploadException;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.driver.dss.syn.DrivePosEnum;
 import com.ruoyi.domain.driver.dss.syn.login.dto.LoginDriverDTO;
 import com.ruoyi.domain.driver.dss.syn.login.vo.LoginDriverVo;
 import com.ruoyi.domain.driver.dss.syn.login.vo.LoginUserInfoVo;
+import com.ruoyi.domain.dss.sign.dto.DssSignDTO;
+import com.ruoyi.domain.dss.sign.dto.DssSignOutDTO;
+import com.ruoyi.domain.dss.sign.vo.DssSignVo;
+import com.ruoyi.domain.dss.sign.vo.SignOutVo;
+import com.ruoyi.in.domain.SignIn;
+import com.ruoyi.in.service.ISignInService;
+import com.ruoyi.pojo.response.SignInResponseVo;
 import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.dss.FaceService;
+import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
-import java.util.*;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 /**
  * @author liujun
@@ -32,35 +48,73 @@ import java.util.*;
 public class DssDriverController extends BaseController {
     @Autowired
     private NewDriverService newDriverService;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private ISignInService signInService;
+    @Autowired
+    private FaceService faceService;
+
+    @PostMapping(value = "Login")
+    @ApiOperation("人员登录设备")
+    public ResponseResult<LoginDriverVo> login(@Valid LoginDriverDTO loginDriverDTO, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+//        Integer id = checkFace();
+//        if (Objects.isNull(id)) {
+//            return AjaxResult.error("登陆数据错误，无法识别人脸");
+//        }
+//        NewDriver newDriver = newDriverService.getById(id);
+        NewDriver driver = faceService.checkFace(convertLoginDriverDTO(loginDriverDTO));
+        return ResponseResult.success(convertNewDriver(driver));
+    }
-    public AjaxResult login(@Valid LoginDriverDTO loginDriverDTO, BindingResult bindingResult) {
+    @PostMapping(value = "SignIn")
+    @ApiOperation("人员签到")
+    public ResponseResult<DssSignVo> sign(@Valid DssSignDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        Integer id = checkFace();
-        if (Objects.isNull(id)) {
-            return AjaxResult.error("登陆数据错误，无法识别人脸");
+        SignIn signIn = convertSignIn(dto);
+        try {
+            AjaxResult ajaxResult = signInService.addSignIn(signIn);
+            if (ajaxResult.isSuccess()) {
+                SignInResponseVo responseVo = (SignInResponseVo) ajaxResult.get(AjaxResult.DATA_TAG);
+                if (Objects.nonNull(responseVo)) {
+                    return ResponseResult.success(convertSignInVo(responseVo));
+                }
+            }
+
+            return ResponseResult.error(Convert.toInt(ajaxResult.get(AjaxResult.CODE_TAG)), Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+        } catch (FileUploadException | IOException e) {
+            log.error("签到信息异常，传入的参数为:[{}]", dto, e);
+            return ResponseResult.error();
         }
-        NewDriver newDriver = newDriverService.getById(id);
-        return AjaxResult.success(convertNewDriver(newDriver));
     }
-    /***
-     * 第三方识别人脸
-     * @author liujun
-     * @date 2024/7/11 17:04
-     * @return java.lang.Integer
-     */
-    private Integer checkFace() {
-        List<NewDriver> lists = newDriverService.list(new NewDriver());
-        if (CollectionUtils.isEmpty(lists)) {
-            return null;
+
+    @PostMapping(value = "SignOut")
+    public ResponseResult<SignOutVo> signOut(@Valid DssSignOutDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        //TODO 对接第三方
-        return 10;
+        SignIn signIn = convertSignIn(dto);
+        try {
+            AjaxResult ajaxResult = signInService.addSignIn(signIn);
+            if (Objects.nonNull(ajaxResult) && ajaxResult.isSuccess()) {
+                return ResponseResult.success(convertSignOutVo(dto));
+            }
+
+            return ResponseResult.error(Convert.toInt(ajaxResult.get(AjaxResult.CODE_TAG)), Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+        } catch (FileUploadException | IOException e) {
+            log.error("签到信息异常，传入的参数为:[{}]", dto, e);
+            return ResponseResult.error();
+        }
     }
+
     /***
      * 登陆转换
      * @author liujun
@@ -83,12 +137,15 @@ public class DssDriverController extends BaseController {
         loginDriverVo.setSynContent(newDriver.getSyncontent());
         loginDriverVo.setCsn(newDriver.getCsn());
-        //TODO 是否强制做检查
-        loginDriverVo.setHealthCheck(0);
-        //TODO 当日最后一次登签的签到状态
-        loginDriverVo.setSignInType(0);
-        //TODO 当日最后一次登签的签退状态
-        loginDriverVo.setSignOutType(0);
+        int healThCheck = 0;
+        SysDictData dictData = querySystData(newDriver.getPosts(), "healthCheck");
+        if (Objects.nonNull(dictData) && StringUtils.isNotEmpty(dictData.getDictValue())) {
+            healThCheck = Convert.toInt(dictData.getDictValue());
+        }
+
+        loginDriverVo.setHealthCheck(healThCheck);
+        loginDriverVo.setSignInType(signInService.signInType(newDriver));
+        loginDriverVo.setSignOutType(signInService.signOutType(newDriver));
         Set<Integer> postSets = new HashSet<>();
@@ -104,4 +161,80 @@ public class DssDriverController extends BaseController {
         return loginDriverVo;
     }
+
+    /***
+     * 查询数据字典
+     * @author liujun
+     * @date 2024/7/12 10:15
+     * @return com.ruoyi.common.core.domain.entity.SysDictData
+     */
+    private SysDictData querySystData(String disKey, String type) {
+        SysDictData sysDictData = new SysDictData();
+        sysDictData.setStatus("0");
+        sysDictData.setDictType(type);
+        sysDictData.setDiscKey(disKey);
+
+
+        return sysDictDataService.getOne(sysDictData);
+    }
+
+    private NewDriver convertLoginDriverDTO(LoginDriverDTO loginDriverDTO) {
+        NewDriver driver = new NewDriver();
+        driver.setImage(loginDriverDTO.getAuthValue());
+//        driver.setIcCardCode()
+        return driver;
+    }
+
+    private SignIn convertSignIn(DssSignDTO dto) {
+        SignIn signIn = new SignIn();
+        signIn.setDeviceId(dto.getDevice());
+//        signIn.setImage();
+        signIn.setJobCode(dto.getStaffCode());
+        signIn.setAlcoholIntake(Convert.toBigDecimal(dto.getTestValue()));
+        signIn.setCreateTime(dto.getSignTime());
+        signIn.setType(1);
+
+//        SysDictData sysDictData = querySystData(null,"drunkenness");
+//        if(Objects.nonNull(sysDictData)){
+//
+//        }
+
+        return signIn;
+    }
+
+    private SignIn convertSignIn(DssSignOutDTO dto) {
+        SignIn signIn = new SignIn();
+        signIn.setDeviceId(dto.getDevice());
+//        signIn.setImage();
+        signIn.setJobCode(dto.getDriverCode());
+
+        signIn.setCreateTime(dto.getLogoutTime());
+        signIn.setType(2);
+
+//        SysDictData sysDictData = querySystData(null,"drunkenness");
+//        if(Objects.nonNull(sysDictData)){
+//
+//        }
+
+        return signIn;
+    }
+
+    private DssSignVo convertSignInVo(SignInResponseVo responseVo) {
+        DssSignVo vo = new DssSignVo();
+        vo.setTestId(Convert.toStr(responseVo.getId()));
+
+        Integer testResult = Objects.equals(responseVo.getExType(), 3) ? 2 : 0;
+        vo.setTestResult(testResult);
+
+        Integer result = Objects.isNull(responseVo.getStatus()) ? 0 : responseVo.getStatus() - 1;
+        vo.setResult(result);
+
+        return vo;
+    }
+
+    private SignOutVo convertSignOutVo(DssSignOutDTO dto) {
+        return new SignOutVo(dto.getDevice(), dto.getDriverCode(), dto.getLogoutTime());
+    }
+
+
 }
@@ -4,9 +4,9 @@ import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.constant.Constants;
 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.domain.entity.SysDictType;
+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.domain.dss.equipment.dto.EquipmentAuthDTO;
@@ -31,7 +31,6 @@ import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.system.service.ISysDictTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import io.swagger.v3.oas.annotations.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -47,7 +46,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -81,47 +79,53 @@ public class DssEquipmentController extends BaseController {
     @ApiOperation("设备获取访问令牌")
     @GetMapping("/Auth")
-    public AjaxResult auth(@Valid EquipmentAuthDTO dto, BindingResult bindingResult) {
+    public ResponseResult auth(@Valid EquipmentAuthDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         Equipment equipment = equipmentService.getOneByDeviceId(dto.getDevice());
         if (Objects.isNull(equipment)) {
             log.info("[{}] equipment is null", dto.getDevice());
-            return AjaxResult.error("设备号错误，请检查设备号");
+            return ResponseResult.error("设备号错误，请检查设备号");
         }
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(equipment.getDeviceId(), equipment.getId());
         AuthenticationContextHolder.setContext(authenticationToken);
         Authentication authentication = authenticationManager.authenticate(authenticationToken);
-        AsyncManager.me().execute(AsyncFactory.recordLogininfor(dto.getDevice(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
-        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(dto.getDevice(), Constants.LOGIN_SUCCESS, MessageUtils.message("equipment.login.success")));
+        //LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        LoginUser loginUser = new LoginUser();
+        loginUser.setUserId(equipment.getId());
+        loginUser.setDeptId(Convert.toLong(equipment.getDeviceId()));
+        loginUser.setUser(new SysUser());
+
+
         String token = tokenService.createToken(loginUser, Constants.EQUIPMENT_KEY);
         AuthVo vo = new AuthVo(token);
-        return AjaxResult.success(vo);
+        return ResponseResult.success(vo);
     }
     @PostMapping("/Heartbeat")
     @ApiOperation("设备报警信息（心跳包）")
-    public AjaxResult heartbeat(@Valid HeartbeatDTO heartbeatDTO, BindingResult bindingResult) {
+    public ResponseResult heartbeat(@Valid @RequestBody HeartbeatDTO heartbeatDTO, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         List<LingangEquipmentHeartbeat> heartbeats = convertHeartbeatDTO(heartbeatDTO);
         if (CollectionUtils.isNotEmpty(heartbeats)) {
             lingangEquipmentHeartbeatService.saveBatch(heartbeats);
         }
-        return AjaxResult.success();
+        return ResponseResult.success();
     }
     @GetMapping(value = "/getConfig")
     @ApiOperation("设备获取远程参数配置")
     @Parameter(name = "device", description = "设备号", required = true)
-    public AjaxResult getConfig(@RequestParam(value = "device") String device) {
+    public ResponseResult getConfig(@RequestParam(value = "device") String device) {
         if (StringUtils.isEmpty(device)) {
-            return AjaxResult.error("设备号不能为空");
+            return ResponseResult.error("设备号不能为空");
         }
         Set<String> keys = Arrays.stream(GET_CONFIG_DICT_KEY).collect(Collectors.toSet());
@@ -131,19 +135,19 @@ public class DssEquipmentController extends BaseController {
         List<SysDictData> list = sysDictDataService.queryDictDateList(sysDictData, keys);
         EquipmentConfigVo configVo = combitionEquipmentConfigVo(list);
-        return AjaxResult.success(configVo);
+        return ResponseResult.success(configVo);
     }
     @PostMapping("/selfcheck")
     @ApiOperation("设备获取远程参数配置")
-    public AjaxResult selfCheck(@Valid EquipmentSelfcheckDto equipmentSelfcheckDto, BindingResult bindingResult) {
+    public ResponseResult selfCheck(@Valid EquipmentSelfcheckDto equipmentSelfcheckDto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         LingangEquimentSelfCheck selfCheck = convertLingangEquimentSelfCheck(equipmentSelfcheckDto);
         lingangEquimentSelfCheckServicelingangEquimentSelfCheckService.insert(selfCheck);
-        return AjaxResult.success();
+        return ResponseResult.success();
     }
     private List<LingangEquipmentHeartbeat> convertHeartbeatDTO(HeartbeatDTO heartbeatDTO) {
 package com.ruoyi.controller.dss;
-import cn.hutool.core.convert.Convert;
+import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.driver.dss.syn.DrivePosEnum;
 import com.ruoyi.domain.driver.dss.syn.dto.DssDriveQueryDTO;
+import com.ruoyi.domain.driver.dss.syn.res.dto.FaceCheckDTO;
 import com.ruoyi.domain.driver.dss.syn.res.dto.FaceRegisterDTO;
 import com.ruoyi.domain.driver.dss.syn.res.dto.ResDataDriveDTO;
+import com.ruoyi.domain.driver.dss.syn.res.vo.FaceCheckVo;
 import com.ruoyi.domain.driver.dss.syn.vo.DssDriveVo;
 import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.dss.FaceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -22,10 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 /**
@@ -41,6 +41,8 @@ public class DssFaceController extends BaseController {
     @Autowired
     private NewDriverService newDriverService;
+    @Autowired
+    private FaceService faceService;
     @PostMapping("/syn/reqData")
     @ApiOperation("获取数据库人员信息")
@@ -51,24 +53,37 @@ public class DssFaceController extends BaseController {
     @ApiOperation("终端同步人脸数据结果上报")
     @PostMapping(value = "/syn/resData")
-    public AjaxResult insertDriver(@Valid ResDataDriveDTO dto, BindingResult bindingResult) {
+    public ResponseResult<Object> insertDriver(@Valid ResDataDriveDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         NewDriver newDriver = convertNewDriver(dto);
-        boolean flag = newDriverService.updateClient(newDriver);
-        return flag ? AjaxResult.success() : AjaxResult.error();
+        TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
+        return new ResponseResult<>(errorTipEnum.getCode(),errorTipEnum.getMsg());
     }
     @ApiOperation(("人脸注册"))
     @PostMapping(value = "FaceRegister")
-    public AjaxResult faceRegister(@Valid FaceRegisterDTO dto, BindingResult bindingResult) {
+    public ResponseResult<Object> faceRegister(@Valid FaceRegisterDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         NewDriver newDriver = convertFaceRegister(dto);
-        boolean flag = newDriverService.faceRegister(newDriver);
-        return flag ? AjaxResult.success() : AjaxResult.error();
+        TipEnum errorTipEnum = newDriverService.faceRegister(newDriver);
+        return new ResponseResult<>(errorTipEnum.getCode(),errorTipEnum.getMsg());
+    }
+
+    @ApiOperation("人脸校验")
+    @PostMapping(value = "FaceCheck")
+    public ResponseResult<FaceCheckVo> faceCheck(@Valid FaceCheckDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        NewDriver driver = convertNewDriver(dto);
+        driver = faceService.checkFace(driver);
+
+        return Objects.isNull(driver) ? ResponseResult.error("登陆匹配失败") : ResponseResult.success(convertFaceCheckVo(driver));
     }
@@ -123,5 +138,19 @@ public class DssFaceController extends BaseController {
         return newDriver;
     }
+    private NewDriver convertNewDriver(FaceCheckDTO dto) {
+        NewDriver driver = new NewDriver();
+        driver.setImage(dto.getFaceValue());
+        return driver;
+    }
+
+    private FaceCheckVo convertFaceCheckVo(NewDriver driver) {
+        FaceCheckVo faceCheckVo = new FaceCheckVo();
+        faceCheckVo.setDriverCode(driver.getIcRfid());
+
+        return faceCheckVo;
+    }
+
+
 }
 package com.ruoyi.controller.dss;
-import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.caiinfo.CarInfo;
-import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
-import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
-import com.ruoyi.domain.keyInfo.box.vo.KeyBoxVo;
-import com.ruoyi.domain.lin.gang.LingangScheduling;
-import com.ruoyi.equipment.domain.Equipment;
-import com.ruoyi.equipment.service.IEquipmentService;
-import com.ruoyi.in.domain.SignIn;
-import com.ruoyi.in.service.ISignInService;
-import com.ruoyi.service.SchedulingService;
-import com.ruoyi.service.carinfo.CarInfoService;
 import com.ruoyi.service.dss.KeyBoxVoService;
 import com.ruoyi.service.equipment.linke.log.LingangEquipmentLinkeLogService;
-import com.ruoyi.service.keyinfo.KeyInfoService;
-import com.ruoyi.service.lin.gang.LingangSchedulingService;
-import com.ruoyi.utils.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,10 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import java.text.MessageFormat;
 import java.util.Date;
-import java.util.List;
-import java.util.Objects;
 /**
  * @author liujun
@@ -53,7 +34,7 @@ public class KeyBoxController extends BaseController {
     @PostMapping(value = "/findKey")
     @ApiOperation("钥匙信息查询")
-    public AjaxResult listSelect(@RequestBody KeyBoxQueryDTO request) {
+    public ResponseResult listSelect(@RequestBody KeyBoxQueryDTO request) {
         LingangEquipmentLinkeLog  linkeLog = saveLog(request);
         return keyBoxVoService.listSelect(request,linkeLog);
 package com.ruoyi.controller.equipment.heartbeat;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.utils.poi.ExcelUtil;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.equipment.heartbeat.LingangEquipmentHeartbeat;
 import com.ruoyi.domain.equipment.heartbeat.dto.LingangEquipmentHeartbeatAddDTO;
 import com.ruoyi.domain.equipment.heartbeat.dto.LingangEquipmentHeartbeatQueryDTO;
@@ -10,31 +15,16 @@ import com.ruoyi.domain.equipment.heartbeat.vo.LingangEquipmentHeartbeatVO;
 import com.ruoyi.service.equipment.heartbeat.LingangEquipmentHeartbeatService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.BeanUtils;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-
-import java.util.List;
-import java.util.Date;
-
-import com.ruoyi.domain.OrderEntity;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.alibaba.fastjson2.JSON;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-
-import org.springframework.validation.BindingResult;
+import java.util.Date;
+import java.util.List;
 @RestController
@@ -57,10 +47,10 @@ public class LingangEquipmentHeartbeatController extends BaseController {
     @ApiOperation("根据ID查询详情")
     @GetMapping(value = "/view/{id}")
-    public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
+    public ResponseResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
         LingangEquipmentHeartbeat source = lingangEquipmentHeartbeatService.getById(id);
-        return com.ruoyi.common.core.domain.AjaxResult.success(convert(source));
+        return ResponseResult.success(convert(source));
     }
@@ -77,37 +67,37 @@ public class LingangEquipmentHeartbeatController extends BaseController {
     @ApiOperation("添加")
     @PreAuthorize("@ss.hasPermi('LinGang:equipment:heartbeat:add')")
     @PostMapping(value = "/add")
-    public com.ruoyi.common.core.domain.AjaxResult add(@Valid @ModelAttribute LingangEquipmentHeartbeatAddDTO request, BindingResult bindingResult) {
+    public ResponseResult add(@Valid @ModelAttribute LingangEquipmentHeartbeatAddDTO request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         LingangEquipmentHeartbeat entity = convert(request);
         entity.setCreateBy(getUserId());
         entity.setCreateTime(new Date());
         int count = lingangEquipmentHeartbeatService.insertSelective(entity);
-        return count > 0 ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("添加数据失败，请稍后再试");
+        return count > 0 ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("添加数据失败，请稍后再试");
     }
     @ApiOperation("修改")
     @PreAuthorize("@ss.hasPermi('LinGang:equipment:heartbeat:update')")
     @PostMapping(value = "/update")
-    public com.ruoyi.common.core.domain.AjaxResult update(@Valid @ModelAttribute LingangEquipmentHeartbeatUpdateDTO request, BindingResult bindingResult) {
+    public ResponseResult update(@Valid @ModelAttribute LingangEquipmentHeartbeatUpdateDTO request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         LingangEquipmentHeartbeat entity = convert(request);
         entity.setUpdateby(getUserId());
         entity.setUpdateTime(new Date());
         boolean flag = lingangEquipmentHeartbeatService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("修改数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('LinGang:equipment:heartbeat:del')")
     @ApiOperation("删除数据")
     @GetMapping(value = "/del/{id}")
-    public com.ruoyi.common.core.domain.AjaxResult delById(@PathVariable("id") Long id) {
+    public ResponseResult delById(@PathVariable("id") Long id) {
         boolean flag = lingangEquipmentHeartbeatService.deleteById(id);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("操作数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("操作数据失败，请稍后再试");
     }
     private LingangEquipmentHeartbeat convert(LingangEquipmentHeartbeatQueryDTO source) {
 package com.ruoyi.controller.equipment.self.check;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.utils.poi.ExcelUtil;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.equipment.self.check.LingangEquimentSelfCheck;
 import com.ruoyi.domain.equipment.self.check.dto.LingangEquimentSelfCheckAddDTO;
 import com.ruoyi.domain.equipment.self.check.dto.LingangEquimentSelfCheckQueryDTO;
@@ -11,31 +16,16 @@ import com.ruoyi.domain.equipment.self.check.vo.LingangEquimentSelfCheckVO;
 import com.ruoyi.service.equipment.self.check.LingangEquimentSelfCheckService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.BeanUtils;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-
-import java.util.List;
-import java.util.Date;
-
-import com.ruoyi.domain.OrderEntity;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.alibaba.fastjson2.JSON;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-
-import org.springframework.validation.BindingResult;
+import java.util.Date;
+import java.util.List;
 @RestController
@@ -57,10 +47,10 @@ public class LingangEquimentSelfCheckController extends BaseController {
     @ApiOperation("根据ID查询详情")
     @GetMapping(value = "/view/{id}")
-    public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
+    public ResponseResult view(@PathVariable("id") Long id, org.springframework.ui.Model model) {
         LingangEquimentSelfCheck source = lingangEquimentSelfCheckService.getById(id);
-        return com.ruoyi.common.core.domain.AjaxResult.success(convert(source));
+        return ResponseResult.success(convert(source));
     }
@@ -77,38 +67,38 @@ public class LingangEquimentSelfCheckController extends BaseController {
     @ApiOperation("添加")
     @PreAuthorize("@ss.hasPermi('LinGang:equiment:self:check:add')")
     @PostMapping(value = "/add")
-    public com.ruoyi.common.core.domain.AjaxResult add(@Valid @ModelAttribute LingangEquimentSelfCheckAddDTO request, BindingResult bindingResult) {
+    public ResponseResult add(@Valid @ModelAttribute LingangEquimentSelfCheckAddDTO request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         LingangEquimentSelfCheck entity = convert(request);
         entity.setCreateBy(getUserId());
         entity.setCreateTime(new Date());
         int count = lingangEquimentSelfCheckService.insertSelective(entity);
-        return count > 0 ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("添加数据失败，请稍后再试");
+        return count > 0 ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("添加数据失败，请稍后再试");
     }
     @ApiOperation("修改")
     @PreAuthorize("@ss.hasPermi('LinGang:equiment:self:check:update')")
     @PostMapping(value = "/update")
-    public com.ruoyi.common.core.domain.AjaxResult update(@Valid @ModelAttribute LingangEquimentSelfCheckUpdateDTO request, BindingResult bindingResult) {
+    public ResponseResult update(@Valid @ModelAttribute LingangEquimentSelfCheckUpdateDTO request, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
-            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         LingangEquimentSelfCheck entity = convert(request);
         entity.setUpdateBy(getUserId());
         entity.setUpdateTime(new Date());
         boolean flag = lingangEquimentSelfCheckService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("修改数据失败，请稍后再试");
     }
     @ApiOperation("修改状态")
     @PreAuthorize("@ss.hasPermi('LinGang:equiment:self:check:update:status')")
     @PostMapping(value = "/update/status")
-    public com.ruoyi.common.core.domain.AjaxResult updateState(@ModelAttribute LingangEquimentSelfCheckUpdateStatusDTO request) {
+    public ResponseResult updateState(@ModelAttribute LingangEquimentSelfCheckUpdateStatusDTO request) {
         LingangEquimentSelfCheck entity = convert(request);
         boolean flag = lingangEquimentSelfCheckService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? ResponseResult.success(Boolean.TRUE) : ResponseResult.error("修改数据失败，请稍后再试");
     }
     private LingangEquimentSelfCheck convert(LingangEquimentSelfCheckQueryDTO source) {
 package com.ruoyi.controller.keyinfo;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.ResponseResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.domain.keyInfo.dto.KeyInfoAddDTO;
@@ -10,31 +14,20 @@ import com.ruoyi.domain.keyInfo.dto.KeyInfoUpdateStatusDTO;
 import com.ruoyi.domain.keyInfo.vo.KeyInfoVO;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
-import com.ruoyi.service.carinfo.CarInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.runtime.options.Option;
 import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.BeanUtils;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import com.alibaba.fastjson2.JSON;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
+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
@@ -73,19 +66,19 @@ public class KeyInfoController {
     @PostMapping(value = "list/select")
     @ApiOperation("（页面选择）")
-    public AjaxResult listSelect(@RequestBody KeyInfoQueryDTO dto) {
+    public ResponseResult listSelect(@RequestBody KeyInfoQueryDTO dto) {
         dto.clearStrEmpty();
         KeyInfo entity = convert(dto);
         List<KeyInfo> selectList = KeyInfoService.listOfSelect(entity);
-        return AjaxResult.success(selectList);
+        return ResponseResult.success(selectList);
     }
     @GetMapping(value = "/view/{id}")
     @ApiOperation("根据ID查看详情")
-    public com.ruoyi.common.core.domain.AjaxResult view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
+    public com.ruoyi.common.core.domain.ResponseResult view(@PathVariable("id") Integer id, org.springframework.ui.Model model) {
         KeyInfo source = KeyInfoService.getById(id);
-        return com.ruoyi.common.core.domain.AjaxResult.success(source);
+        return com.ruoyi.common.core.domain.ResponseResult.success(source);
     }
     @PreAuthorize("@ss.hasPermi('key:info:export')")
@@ -102,31 +95,31 @@ public class KeyInfoController {
     @PreAuthorize("@ss.hasPermi('key:info:add')")
     @PostMapping(value = "/add")
     @ApiOperation("添加")
-    public com.ruoyi.common.core.domain.AjaxResult add(@ModelAttribute KeyInfoAddDTO request) {
+    public com.ruoyi.common.core.domain.ResponseResult add(@ModelAttribute KeyInfoAddDTO request) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
         int count = KeyInfoService.insertSelective(entity);
-        return count > 0 ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("添加数据失败，请稍后再试");
+        return count > 0 ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("添加数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('key:info:update')")
     @PostMapping(value = "/update")
     @ApiOperation("修改")
-    public com.ruoyi.common.core.domain.AjaxResult update(@ModelAttribute KeyInfoUpdateDTO request) {
+    public com.ruoyi.common.core.domain.ResponseResult update(@ModelAttribute KeyInfoUpdateDTO request) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
         boolean flag = KeyInfoService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
     @PreAuthorize("@ss.hasPermi('key:info:update:status')")
     @PostMapping(value = "/update/status")
     @ApiOperation("修改状态")
-    public com.ruoyi.common.core.domain.AjaxResult updateState(@ModelAttribute KeyInfoUpdateStatusDTO request) {
+    public com.ruoyi.common.core.domain.ResponseResult updateState(@ModelAttribute KeyInfoUpdateStatusDTO request) {
         request.clearStrEmpty();
         KeyInfo entity = convert(request);
         boolean flag = KeyInfoService.updateByPrimaryKey(entity);
-        return flag ? com.ruoyi.common.core.domain.AjaxResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.AjaxResult.error("修改数据失败，请稍后再试");
+        return flag ? com.ruoyi.common.core.domain.ResponseResult.success(Boolean.TRUE) : com.ruoyi.common.core.domain.ResponseResult.error("修改数据失败，请稍后再试");
     }
     private KeyInfo convert(KeyInfoQueryDTO source) {
+package com.ruoyi.domain.driver.dss.syn.res.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 10:41
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "人脸校验DTO")
+@EqualsAndHashCode(callSuper = false)
+public class FaceCheckDTO implements java.io.Serializable {
+    @NotEmpty(message = "设备上线号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+    @NotEmpty(message = "IC卡号不能为空")
+    @ApiModelProperty(value = "IC卡号", required = true)
+    private String driverCode;
+
+    @NotEmpty(message = "时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "时间", required = true)
+    private Date checkTime;
+
+    @NotEmpty(message = "人脸图片数据不能为空")
+    @ApiModelProperty(value = "人脸图片数据图片数据格式为BASE64", required = true)
+    private String faceValue;
+}
+package com.ruoyi.domain.driver.dss.syn.res.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 10:45
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "人脸校验VO")
+@EqualsAndHashCode(callSuper = false)
+public class FaceCheckVo implements java.io.Serializable {
+    @ApiModelProperty(value = "IC卡号")
+    private String driverCode;
+    @ApiModelProperty(value = "表情  0无情绪，1愤怒，2厌恶，3恐惧，4高兴，5伤心，6惊讶")
+    private Integer emotion;
+}
+package com.ruoyi.domain.dss.sign.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 16:44
+ */
+@Data
+@ApiModel(value = "人员签到")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssSignDTO {
+    @NotNull(message = "设备上线号 不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+
+    @NotNull(message = "设备类型 不能为空")
+    @ApiModelProperty(value = "设备类型", required = true)
+    private String deviceType;
+
+    @NotNull(message = "司机卡号 不能为空")
+    @ApiModelProperty(value = "司机卡号", required = true)
+    private String driverCode;
+
+    @NotNull(message = "司机工号 不能为空")
+    @ApiModelProperty(value = "司机工号", required = true)
+    private String staffCode;
+
+    @NotNull(message = "时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "时间", required = true)
+    private Date signTime;
+
+    @ApiModelProperty(value = "酒测记录值")
+    private Integer testValue;
+
+    @ApiModelProperty(value = "体温度值,null表示不需岗前检测")
+    private BigDecimal temperature;
+
+    @ApiModelProperty(value = "情绪类型")
+    private Integer emotion;
+
+    @ApiModelProperty(value = "问卷渠道")
+    private String channelCode;
+
+    @ApiModelProperty(value = "健康数据有效性; 0:否，1:是")
+    private String healthCheck;
+
+    @ApiModelProperty(value = "健康数据")
+    private DssSignHealthDataDTO healthData;
+
+    @ApiModelProperty(value = "答题记录")
+    private DssSignQuestionRecordDTO questionRecord;
+}
+package com.ruoyi.domain.dss.sign.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 16:45
+ */
+@Data
+@ApiModel(value = "人员签到-健康数据")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssSignHealthDataDTO {
+    @ApiModelProperty(value = "血压舒张值")
+    private BigDecimal systolicPressure;
+    @ApiModelProperty(value = "血压收缩值")
+    private BigDecimal diastolicPressure;
+    @ApiModelProperty(value = "血氧值")
+    private BigDecimal OxygenValue;
+    @ApiModelProperty(value = "心率值")
+    private BigDecimal heartRate;
+
+}
+package com.ruoyi.domain.dss.sign.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 11:29
+ */
+@Data
+@ApiModel(value = "人员签退")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssSignOutDTO implements java.io.Serializable {
+
+
+    private static final long serialVersionUID = 3995970715143952495L;
+
+    @NotNull(message = "签退设备上线号 不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+    @NotNull(message = "签退卡号 不能为空")
+    @ApiModelProperty(value = "卡号")
+    private String driverCode;
+
+    @NotNull(message = "签退时间不能为空")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "设备时间,yyyy-MM-dd HH:mm:ss")
+    private Date logoutTime;
+}
+package com.ruoyi.domain.dss.sign.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 16:53
+ */
+@Data
+@ApiModel(value = "人员签到-问卷答案集合")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssSignQuestionAnswerDTO {
+    @ApiModelProperty("答案编码")
+    private String answerCode;
+    @ApiModelProperty("答案描述")
+    private String answerContent;
+    @ApiModelProperty("答案日期")
+    private String answerDate;
+    @ApiModelProperty("记录明细ID")
+    private String detailId;
+    @ApiModelProperty("题目ID")
+    private String questionId;
+    @ApiModelProperty("题目序号")
+    private String questionNo;
+    @ApiModelProperty("题目标题")
+    private String questionTitle;
+    @ApiModelProperty("题目类型")
+    private String questionType;
+    @ApiModelProperty("调查记录ID")
+    private String recordId;
+}
+package com.ruoyi.domain.dss.sign.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 16:49
+ */
+@Data
+@ApiModel(value = "人员签到-答题记录")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+public class DssSignQuestionRecordDTO {
+    @ApiModelProperty(value = "渠道ID")
+    private String channelId;
+    @ApiModelProperty(value = "渠道编码")
+    private String channelCode;
+    @ApiModelProperty(value = "渠道名称")
+    private String channelName;
+    @ApiModelProperty(value = "设备ID")
+    private String deviceId;
+    @ApiModelProperty(value = "用户所属组织ID")
+    private String orgId;
+    @ApiModelProperty(value = "用户所属组织名称")
+    private String orgName;
+    @ApiModelProperty(value = "题库ID")
+    private String subjectId;
+    @ApiModelProperty(value = "题库标题")
+    private String subjectName;
+    @ApiModelProperty(value = "用户编码")
+    private String userCode;
+    @ApiModelProperty(value = "用户ID")
+    private String userId;
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+    @ApiModelProperty(value = "问卷答案集合")
+    private List<DssSignQuestionAnswerDTO> questionAnswerList;
+}
+package com.ruoyi.domain.dss.sign.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 10:46
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "人员签到-健康检测结果VO")
+public class DssSignHealthDataVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = 8312913668942617700L;
+
+    @ApiModelProperty(value = "血压舒张 0:正常 1:低 2:高")
+    private Integer systolicPressure;
+    @ApiModelProperty(value = "血压收缩 0:正常 1:低 2:高")
+    private Integer diastolicPressure;
+    @ApiModelProperty(value = "血氧 0:正常 1:低 2:高")
+    private Integer oxygenValue;
+    @ApiModelProperty(value = "心率 0:正常 1:低 2:高")
+    private Integer heartRate;
+}
+package com.ruoyi.domain.dss.sign.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 10:41
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "人员签到VO")
+public class DssSignVo implements java.io.Serializable {
+    @ApiModelProperty(value = "酒测记录Id")
+    private String testId;
+    @ApiModelProperty(value = "酒精测试结果  0:正常 1:饮酒 2:醉酒", example = "1")
+    private Integer testResult;
+    @ApiModelProperty(value = "体温测试结果  0:正常 1:异常", example = "1")
+    private Integer tempResult;
+
+    @ApiModelProperty(value = "签到结果  0:签到成功 1:签到失败", example = "1")
+    private Integer result;
+
+    @ApiModelProperty(value = "问卷ID")
+    private String quesId;
+    
+    @ApiModelProperty(value = "健康检测结果")
+    private DssSignHealthDataVo healthData;
+}
+package com.ruoyi.domain.dss.sign.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 13:08
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "人员签退VO")
+public class SignOutVo {
+    @ApiModelProperty(value = "设备上线号")
+    private String device;
+    @ApiModelProperty(value = "卡号")
+    private String driverCode;
+
+    @ApiModelProperty(value = "设备时间,yyyy-MM-dd HH:mm:ss")
+    private Date logoutTime;
+}
 package com.ruoyi.equipment.service;
-import java.util.Collection;
-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
 import com.ruoyi.pojo.vo.EquipmentResponseVo;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 设备信息Service接口
  *
@@ -34,6 +33,15 @@ public interface IEquipmentService extends IService&lt;Equipment&gt; {
     Equipment getOneByDeviceId(String deviceId);
     /***
+     * 根据设备号查询设备信息
+     * @author liujun
+     * @date 2024/7/5 15:23
+     * @param deviceId
+     * @return com.ruoyi.equipment.domain.Equipment
+     */
+    Equipment getOne(Equipment equipment);
+
+    /***
      *用于页面选择
      * @author liujun
      * @date 2024/6/21 20:51
 package com.ruoyi.equipment.service.impl;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
+import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.keyInfo.KeyInfo;
+import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.domain.EquipmentLog;
-import com.ruoyi.mapper.keyinfo.KeyInfoMapper;
+import com.ruoyi.equipment.mapper.EquipmentMapper;
+import com.ruoyi.equipment.service.IEquipmentService;
 import com.ruoyi.pojo.equipment.EquipmentOnline;
 import com.ruoyi.pojo.vo.EquipmentResponseVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
-import com.ruoyi.equipment.mapper.EquipmentMapper;
-import com.ruoyi.equipment.domain.Equipment;
-import com.ruoyi.equipment.service.IEquipmentService;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 /**
  * 设备信息Service业务层处理
@@ -33,7 +34,7 @@ import javax.annotation.Resource;
  * @date 2023-07-05
  */
 @Service
-public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment> implements IEquipmentService {
+public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment> implements IEquipmentService, UserDetailsService {
     @Autowired
     private EquipmentMapper equipmentMapper;
@@ -59,6 +60,12 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
     }
     @Override
+    public Equipment getOne(Equipment equipment) {
+        LambdaQueryWrapper<Equipment> wrapper = new LambdaQueryWrapper<>(equipment);
+        return getOne(wrapper);
+    }
+
+    @Override
     public List<Equipment> listOfSelect(Equipment equipment) {
         return equipmentMapper.queryIdsiteNameBypromise(equipment.getPromise());
@@ -160,4 +167,49 @@ public class EquipmentServiceImpl extends ServiceImpl&lt;EquipmentMapper, Equipment
         List<String> equipment = list.stream().map(Equipment::getSiteName).distinct().collect(Collectors.toList());
         return equipment;
     }
+
+    @Override
+    public UserDetails loadUserByUsername(String deviceId) throws UsernameNotFoundException {
+        Equipment equipment = getOneByDeviceId(deviceId);
+        if (Objects.isNull(equipment)) {
+            return null;
+        }
+
+        return new UserDetails() {
+            @Override
+            public Collection<? extends GrantedAuthority> getAuthorities() {
+                return null;
+            }
+
+            @Override
+            public String getPassword() {
+                return SecurityUtils.encryptPassword(Convert.toStr(equipment.getId()));
+            }
+
+            @Override
+            public String getUsername() {
+                return deviceId;
+            }
+
+            @Override
+            public boolean isAccountNonExpired() {
+                return true;
+            }
+
+            @Override
+            public boolean isAccountNonLocked() {
+                return true;
+            }
+
+            @Override
+            public boolean isCredentialsNonExpired() {
+                return true;
+            }
+
+            @Override
+            public boolean isEnabled() {
+                return true;
+            }
+        };
+    }
 }
@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.FileUploadException;
+import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.pojo.response.SignInResponseVo;
@@ -12,15 +13,14 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * 签到Service接口
- * 
+ *
  * @author guzijian
  * @date 2023-07-05
  */
-public interface ISignInService 
-{
+public interface ISignInService {
     /**
      * 查询签到
-     * 
+     *
      * @param id 签到主键
      * @return 签到
      */
@@ -28,7 +28,7 @@ public interface ISignInService
     /**
      * 查询签到列表
-     * 
+     *
      * @param signIn 签到
      * @return 签到集合
      */
@@ -36,7 +36,7 @@ public interface ISignInService
     /**
      * 修改签到
-     * 
+     *
      * @param signIn 签到
      * @return 结果
      */
@@ -44,7 +44,7 @@ public interface ISignInService
     /**
      * 批量删除签到
-     * 
+     *
      * @param ids 需要删除的签到主键集合
      * @return 结果
      */
@@ -52,7 +52,7 @@ public interface ISignInService
     /**
      * 删除签到信息
-     * 
+     *
      * @param id 签到主键
      * @return 结果
      */
@@ -60,6 +60,7 @@ public interface ISignInService
     /**
      * 设备签到
+     *
      * @param signIn
      * @return
      */
@@ -67,9 +68,29 @@ public interface ISignInService
     String repairSignRecord(HttpServletRequest request);
-    String repairAllSignRecord(HttpServletRequest request,String date);
+    String repairAllSignRecord(HttpServletRequest request, String date);
     AjaxResult supplementarySignature(SignIn signIn);
     List<SignInResponseVo> selectSignInByIds(List<Long> collect);
+
+    /***
+     *当日最后一次登签的签到状态
+     *
+     * @author liujun
+     * @date 2024/7/12 10:25
+     * @param driver
+     * @return int 0:未签到，1:已签到
+     */
+    int signInType(NewDriver driver);
+
+    /***
+     *当日最后一次登签的签退状态
+     *
+     * @author liujun
+     * @date 2024/7/12 10:25
+     * @param driver
+     * @return int 0:未签到，1:已签到
+     */
+    int signOutType(NewDriver driver);
 }
@@ -25,6 +25,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.driver.domain.Driver;
 import com.ruoyi.driver.mapper.DriverMapper;
 import com.ruoyi.driver.mapper.DriverSchedulingMapper;
@@ -319,6 +320,18 @@ public class SignInServiceImpl implements ISignInService {
         return signInMapper.selectSignInByIds(collect);
     }
+    @Override
+    public int signInType(NewDriver driver) {
+        //TODO
+        return 0;
+    }
+
+    @Override
+    public int signOutType(NewDriver driver) {
+        //TODO
+        return 0;
+    }
+
     private String handleDate(String dateString) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+package com.ruoyi.service;
+
+import org.springframework.security.core.userdetails.UserDetailsService;
+
+
+public interface IUserDetailsService extends UserDetailsService {
+}
 package com.ruoyi.service.driver;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import java.util.List;
-
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.TipEnum;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.driver.NewDriver;
+import java.util.List;
+
 public interface NewDriverService extends IService<NewDriver> {
     /**
@@ -55,7 +55,7 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
      * @author liujun
      * @date 2024/7/11 16:07
      */
-    boolean updateClient(NewDriver entity);
+    TipEnum updateClient(NewDriver entity);
     /***
      * 人脸注册
@@ -64,7 +64,7 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
      * @param entity
      * @return boolean
      */
-    boolean faceRegister(NewDriver entity);
+    TipEnum faceRegister(NewDriver entity);
     boolean deleteById(java.lang.String jobCode);
 }
 \ No newline at end of file
+package com.ruoyi.service.dss;
+
+import com.ruoyi.domain.driver.NewDriver;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 10:50
+ */
+public interface FaceService {
+    /***
+     * 校验人脸
+     * @author liujun
+     * @date 2024/7/12 10:50
+     * @param driver 图片的base64字符串放到了image
+     * @return com.ruoyi.domain.driver.NewDriver
+     */
+    NewDriver checkFace(NewDriver driver);
+
+}
 package com.ruoyi.service.dss;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
 import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
@@ -11,5 +11,5 @@ import com.ruoyi.domain.keyInfo.box.dto.KeyBoxQueryDTO;
  */
 public interface KeyBoxVoService {
     /**钥匙信息查询*/
-    AjaxResult listSelect( KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog);
+    ResponseResult listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog);
 }
+package com.ruoyi.service.impl;
+
+import com.ruoyi.equipment.service.impl.EquipmentServiceImpl;
+import com.ruoyi.framework.web.service.UserDetailsServiceImpl;
+import com.ruoyi.service.IUserDetailsService;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Objects;
+
+/**
+ * @author liujun
+ * @date 2024年07月16日 13:37
+ */
+@Service(value="com.ruoyi.service.impl.LingGangUserDetailsServiceImpl")
+public class LingGangUserDetailsServiceImpl implements IUserDetailsService {
+    @Resource(type = UserDetailsServiceImpl.class)
+    private UserDetailsService userDetailsService;
+
+    @Resource(type = EquipmentServiceImpl.class)
+    private UserDetailsService equipmentService;
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        UserDetails userDetails = equipmentService.loadUserByUsername(username);
+        if (Objects.isNull(userDetails)) {
+            userDetails = userDetailsService.loadUserByUsername(username);
+        }
+        return userDetails;
+    }
+}
 package com.ruoyi.service.impl.carinfo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.caiinfo.CarInfo;
-import com.ruoyi.equipment.domain.Equipment;
+import com.ruoyi.mapper.carinfo.CarInfoMapper;
 import com.ruoyi.service.carinfo.CarInfoService;
 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 javax.servlet.http.HttpServletResponse;
+import org.springframework.util.CollectionUtils;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import com.ruoyi.domain.caiinfo.CarInfo;
-import com.ruoyi.mapper.carinfo.CarInfoMapper;
-import com.ruoyi.service.carinfo.CarInfoService;
-import org.springframework.util.CollectionUtils;
-
 @Service
 public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> implements CarInfoService {
     @Autowired
@@ -180,6 +173,8 @@ public class CarInfoServiceImpl extends ServiceImpl&lt;CarInfoMapper, CarInfo&gt; impl
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateTime")) {
                 wrapper.orderByDesc(CarInfo::getUpdateTime);
             }
+        }else{
+            wrapper.orderByDesc(CarInfo::getCreateTime);
         }
     }
 }
 \ No newline at end of file
 package com.ruoyi.service.impl.driver;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.TipEnum;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.config.BsthSystemConfig;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.mapper.driver.NewDriverMapper;
 import com.ruoyi.service.driver.NewDriverService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 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 javax.servlet.http.HttpServletResponse;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import com.ruoyi.domain.OrderEntity;
+import java.io.File;
+import java.util.*;
 @Service
+@Slf4j
 public class NewDriverServiceImpl extends ServiceImpl<NewDriverMapper, NewDriver> implements NewDriverService {
     @Autowired
     private NewDriverMapper newDriverMapper;
+    @Autowired
+    private BsthSystemConfig bsthSystemConfig;
     /**
      * 分页查询
@@ -116,26 +118,56 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     }
     @Override
-    public boolean updateClient(NewDriver entity) {
-        LambdaUpdateWrapper<NewDriver> wrapper = new LambdaUpdateWrapper<NewDriver>();
+    public TipEnum updateClient(NewDriver entity) {
+        NewDriver driver = new NewDriver();
+        driver.setJobCode(entity.getJobCode());
+        NewDriver source = getOne(driver);
+        if (Objects.isNull(source)) {
+            log.info("[{}]找不到数据", entity);
+            return TipEnum.TIP_404;
+        }
+
+        LambdaUpdateWrapper<NewDriver> wrapper = new LambdaUpdateWrapper<>();
         wrapper.set(NewDriver::getImage, entity.getImage()).set(NewDriver::getFaceFeature, entity.getFaceFeature())
                 .set(NewDriver::getBlueTooth, entity.getBlueTooth()).set(NewDriver::getInteger, entity.getInteger())
                 .set(NewDriver::getSyncontent, entity.getSyncontent()).set(NewDriver::getCsn, entity.getCsn())
-                .eq(NewDriver::getJobCode, entity.getJobCode());
-
-        return update(wrapper);
+                .eq(NewDriver::getId, entity.getJobCode());
+        boolean flag = update(wrapper);
+        return flag ? TipEnum.TIP_200 : TipEnum.TIP_500;
     }
     @Override
-    public boolean faceRegister(NewDriver entity) {
+    public TipEnum faceRegister(NewDriver entity) {
+        NewDriver driver = new NewDriver();
+        driver.setIdRfid(entity.getIcCardCode());
+        NewDriver source = getOne(driver);
+        if (Objects.isNull(source)) {
+            log.info("[{}]找不到数据", entity);
+            return TipEnum.TIP_404;
+        }
         LambdaUpdateWrapper<NewDriver> wrapper = new LambdaUpdateWrapper<NewDriver>();
-        //TODO 保存图片信息
+        StringBuilder builder = new StringBuilder(bsthSystemConfig.getImageBasePath());
+        builder.append(File.separator);
+        builder.append(source.getId());
+        builder.append(File.separator);
+        builder.append("image");
+
+        ResponseResult<String> resultObj = FileUploadUtils.uploadBase64OfImage(builder.toString(), UUID.randomUUID().toString().
+                replaceAll("-", ""), "png", entity.getImage());
+        if (!resultObj.isSuccess()) {
+            return TipEnum.getObjByCode(resultObj.getCode());
+        }
+
+        String result = StringUtils.substringAfter(resultObj.getData(), bsthSystemConfig.getImageBasePath() + File.separator);
+        entity.setImage(result);
+
         wrapper.set(NewDriver::getImage, entity.getImage())
                 .set(NewDriver::getFaceSignIn, entity.getFaceSignIn())
                 .set(NewDriver::getSignInEquipment, entity.getFaceSignIn())
-                .eq(NewDriver::getJobCode, entity.getIcCardCode());
-        return update(wrapper);
+                .eq(NewDriver::getId, source.getId());
+        boolean flag = update(wrapper);
+        return flag ? TipEnum.TIP_200 : TipEnum.TIP_500;
     }
     /***根据主键删除数据*/
@@ -280,6 +312,8 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "fleetName")) {
                 wrapper.orderByDesc(NewDriver::getFleetName);
             }
+        } else {
+            wrapper.orderByDesc(NewDriver::getId);
         }
     }
+package com.ruoyi.service.impl.dss;
+
+import com.ruoyi.domain.driver.NewDriver;
+import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.service.dss.FaceService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 10:51
+ */
+@Service
+@Slf4j
+public class FaceServiceImpl implements FaceService {
+    @Autowired
+    private NewDriverService newDriverService;
+
+    @Override
+    public NewDriver checkFace(NewDriver driver) {
+        List<NewDriver> drivers = newDriverService.list(new NewDriver());
+        return checkFace(drivers);
+    }
+
+    private NewDriver checkFace(List<NewDriver> drivers) {
+        if (CollectionUtils.isEmpty(drivers)) {
+            return null;
+        }
+
+        return null;
+    }
+}
@@ -2,7 +2,7 @@ package com.ruoyi.service.impl.dss;
 import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.constant.HttpStatus;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.domain.caiinfo.CarInfo;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
@@ -46,7 +46,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
     private LingangEquipmentLinkeLogService lingangEquipmentLinkeLogService;
     @Override
-    public AjaxResult listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog) {
+    public ResponseResult listSelect(KeyBoxQueryDTO request, LingangEquipmentLinkeLog linkeLog) {
         LingangScheduling lingangScheduling = queryScheduling(request);
         if (Objects.isNull(lingangScheduling)) {
             String msg = MessageFormat.format("工号[{0}]在[{1}]没有排班信息", request.getStaffCode(), request.getTime());
@@ -54,7 +54,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
             linkeLog.setResult(msg);
             lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog);
-            return AjaxResult.error(msg);
+            return ResponseResult.error(msg);
         }
         SignIn signIn = querySignIn(lingangScheduling.getSignInId());
@@ -62,7 +62,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
             lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog, MessageFormat.format("工号[{0}]在[{1}]没有签到或签退信息;[{2}]", request.getStaffCode(), request.getTime(), lingangScheduling.getSignInId()), HttpStatus.ERROR);
-            return AjaxResult.error(MessageFormat.format("工号[{0}]在[{1}]没有签到或签退信息", request.getStaffCode(), request.getTime()));
+            return ResponseResult.error(MessageFormat.format("工号[{0}]在[{1}]没有签到或签退信息", request.getStaffCode(), request.getTime()));
         }
         KeyInfo keyInfo = queryKeyInfo(lingangScheduling.getKeyInfoId());
@@ -70,7 +70,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
             lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog, MessageFormat.format("工号[{0}]在[{1}]没有分配钥匙;[{2}]", request.getStaffCode(), request.getTime(), lingangScheduling.getKeyInfoId()), HttpStatus.ERROR);
-            return AjaxResult.error(MessageFormat.format("工号[{0}]在[{1}]没有分配钥匙", request.getStaffCode(), request.getTime()));
+            return ResponseResult.error(MessageFormat.format("工号[{0}]在[{1}]没有分配钥匙", request.getStaffCode(), request.getTime()));
         }
@@ -78,7 +78,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
         if (Objects.isNull(equipment)) {
             lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog, MessageFormat.format("工号[{0}]在[{1}]找不到设备信息;[{2}]", request.getStaffCode(), request.getTime(), signIn.getDeviceId()), HttpStatus.ERROR);
-            return AjaxResult.error(MessageFormat.format("工号[{0}]在[{1}]找不到设备信息", request.getStaffCode(), request.getTime()));
+            return ResponseResult.error(MessageFormat.format("工号[{0}]在[{1}]找不到设备信息", request.getStaffCode(), request.getTime()));
         }
         CarInfo carInfo = queryCarInfo(lingangScheduling.getNbbm());
@@ -86,7 +86,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
             lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog, MessageFormat.format("工号[{0}]在[{1}]找不到设备信息;[{2}]", request.getStaffCode(), request.getTime(), lingangScheduling.getNbbm()), HttpStatus.ERROR);
-            return AjaxResult.error(MessageFormat.format("工号[{0}]在[{1}]找不到车辆信息", request.getStaffCode(), request.getTime()));
+            return ResponseResult.error(MessageFormat.format("工号[{0}]在[{1}]找不到车辆信息", request.getStaffCode(), request.getTime()));
         }
         KeyBoxVo keyBoxVo = new KeyBoxVo();
         keyBoxVo.setCabinetNo(Convert.toStr(keyInfo.getCabinetno()));
@@ -98,7 +98,7 @@ public class KeyBoxVoServiceImpl implements KeyBoxVoService {
         keyBoxVo.setParkingNo(carInfo.getParkingNo());
         lingangEquipmentLinkeLogService.updateByPrimaryKey(linkeLog, null, HttpStatus.SUCCESS);
-        return AjaxResult.success(keyBoxVo);
+        return ResponseResult.success(keyBoxVo);
     }
 package com.ruoyi.service.impl.equipment.heartbeat;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.equipment.heartbeat.LingangEquipmentHeartbeat;
 import com.ruoyi.mapper.equipment.heartbeat.LingangEquipmentHeartbeatMapper;
 import com.ruoyi.service.equipment.heartbeat.LingangEquipmentHeartbeatService;
 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 java.util.Collections;
 import java.util.List;
-import com.ruoyi.domain.OrderEntity;
-
 @Service
 /**设备心跳包 Service实现类*/
 public class LingangEquipmentHeartbeatServiceImpl extends ServiceImpl<LingangEquipmentHeartbeatMapper, LingangEquipmentHeartbeat> implements LingangEquipmentHeartbeatService {
@@ -157,6 +154,8 @@ public class LingangEquipmentHeartbeatServiceImpl extends ServiceImpl&lt;LingangEqu
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "updateby")) {
                 wrapper.orderByDesc(LingangEquipmentHeartbeat::getUpdateby);
             }
+        }else{
+            wrapper.orderByDesc(LingangEquipmentHeartbeat::getCreateTime);
         }
     }
 }
 \ No newline at end of file
 package com.ruoyi.service.impl.equipment.linke.log;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.equipment.linke.log.LingangEquipmentLinkeLog;
 import com.ruoyi.mapper.equipment.linke.log.LingangEquipmentLinkeLogMapper;
 import com.ruoyi.service.equipment.linke.log.LingangEquipmentLinkeLogService;
 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 java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import com.ruoyi.domain.OrderEntity;
-
 @Service
 /**设备链接日志 Service实现类*/
 public class LingangEquipmentLinkeLogServiceImpl extends ServiceImpl<LingangEquipmentLinkeLogMapper, LingangEquipmentLinkeLog> implements LingangEquipmentLinkeLogService {
@@ -138,6 +135,8 @@ public class LingangEquipmentLinkeLogServiceImpl extends ServiceImpl&lt;LingangEqui
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "createTime")) {
                 wrapper.orderByDesc(LingangEquipmentLinkeLog::getCreateTime);
             }
+        }else{
+            wrapper.orderByDesc(LingangEquipmentLinkeLog::getCreateTime);
         }
     }
 }
 \ No newline at end of file
 package com.ruoyi.service.impl.equipment.self.check;
-import com.ruoyi.common.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.equipment.self.check.LingangEquimentSelfCheck;
 import com.ruoyi.eexception.domain.EquipmentException;
 import com.ruoyi.eexception.service.IEquipmentExceptionService;
 import com.ruoyi.mapper.equipment.self.check.LingangEquimentSelfCheckMapper;
 import com.ruoyi.service.equipment.self.check.LingangEquimentSelfCheckService;
-import org.apache.commons.collections4.CollectionUtils;
 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 java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import com.ruoyi.domain.OrderEntity;
-
 @Service
 /**设备自检 Service实现类*/
 public class LingangEquimentSelfCheckServiceImpl extends ServiceImpl<LingangEquimentSelfCheckMapper, LingangEquimentSelfCheck> implements LingangEquimentSelfCheckService {
@@ -190,6 +186,8 @@ public class LingangEquimentSelfCheckServiceImpl extends ServiceImpl&lt;LingangEqui
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "iskeybox")) {
                 wrapper.orderByDesc(LingangEquimentSelfCheck::getIskeybox);
             }
+        }else{
+            wrapper.orderByDesc(LingangEquimentSelfCheck::getId);
         }
     }
 package com.ruoyi.service.impl.keyinfo;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.keyInfo.KeyInfo;
 import com.ruoyi.service.keyinfo.KeyInfoService;
 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 javax.servlet.http.HttpServletResponse;
 import java.util.Collections;
 import java.util.List;
@@ -178,6 +175,8 @@ public class KeyInfoServiceImpl extends ServiceImpl&lt;com.ruoyi.mapper.keyinfo.Key
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "plateNum")) {
                 wrapper.orderByDesc(KeyInfo::getPlateNum);
             }
+        }else{
+            wrapper.orderByDesc(KeyInfo::getCreateTime);
         }
     }
 package com.ruoyi.service.impl.lin.gang;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.lin.gang.LingangScheduling;
 import com.ruoyi.mapper.lin.gang.LingangSchedulingMapper;
 import com.ruoyi.service.lin.gang.LingangSchedulingService;
 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 javax.servlet.http.HttpServletResponse;
-
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import com.ruoyi.domain.OrderEntity;
-
 @Service
 /** Service实现类*/
 public class LingangSchedulingServiceImpl extends ServiceImpl<LingangSchedulingMapper, LingangScheduling> implements LingangSchedulingService {
@@ -214,6 +209,8 @@ public class LingangSchedulingServiceImpl extends ServiceImpl&lt;LingangSchedulingM
             if (org.apache.commons.lang3.StringUtils.equals(orderEntity.getProp(), "remark")) {
                 wrapper.orderByDesc(LingangScheduling::getRemark);
             }
+        }else{
+            wrapper.orderByDesc(LingangScheduling::getId);
         }
     }
 }
 \ No newline at end of file
 package com.ruoyi.web.core.config;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.swagger.annotations.Api;
+import cn.hutool.core.convert.Convert;
+import com.ruoyi.common.TipEnum;
+import com.ruoyi.common.config.RuoYiConfig;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.config.RuoYiConfig;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.models.auth.In;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.PathSelectors;
 import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.ApiKey;
-import springfox.documentation.service.AuthorizationScope;
-import springfox.documentation.service.Contact;
-import springfox.documentation.service.SecurityReference;
-import springfox.documentation.service.SecurityScheme;
+import springfox.documentation.builders.ResponseBuilder;
+import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Swagger2的接口配置
  * 
@@ -51,7 +49,10 @@ public class SwaggerConfig
     @Bean
     public Docket createRestApi()
     {
+        List<Response> tips= Arrays.stream(TipEnum.values()).map(err-> new ResponseBuilder().code(Convert.toStr(err.getCode())).description(err.getMsg()).build()).collect(Collectors.toList());
         return new Docket(DocumentationType.OAS_30)
+                .globalResponses(org.springframework.http.HttpMethod.GET,tips)
+                .globalResponses(org.springframework.http.HttpMethod.POST,tips)
                 // 是否启用Swagger
                 .enable(enabled)
                 // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
@@ -194,4 +194,8 @@ netty:
         catalogue:
             image: device/image
             speech: device/speech
-        port: 8989
 \ No newline at end of file
+        port: 8989
+bsth:
+    upload:
+        image:
+            basePath: D:/temp/temp/bsth/upload
 \ No newline at end of file
@@ -20,6 +20,7 @@ user.password.not.valid=* 5-50个字符
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功
+equipment.login.success=登录成功
 user.register.success=注册成功
 user.notfound=请重新登录
 user.forcelogout=管理员强制退出，请重新登录
@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.mapper.driver.NewDriverMapper">
     <resultMap id="BaseResultMap" type="com.ruoyi.domain.driver.NewDriver">
-        <result column="id" jdbcType="INTEGER" property="id"/>
-        <id column="job_code" jdbcType="VARCHAR" property="jobCode"/>
+        <id column="id" jdbcType="INTEGER" property="id"/>
+        <result column="job_code" jdbcType="VARCHAR" property="jobCode"/>
         <result column="company_code" jdbcType="VARCHAR" property="companyCode"/>
         <result column="branche_company_code" jdbcType="VARCHAR" property="brancheCompanyCode"/>
         <result column="personnel_name" jdbcType="VARCHAR" property="personnelName"/>
@@ -6,7 +6,7 @@
         <result column="device" jdbcType="VARCHAR" property="device"/>
         <result column="app_version" jdbcType="VARCHAR" property="appVersion"/>
         <result column="wine" jdbcType="INTEGER" property="wine"/>
-        <result column="cameras" jdbcType="JSON" property="cameras"/>
+        <result column="cameras" jdbcType="VARCHAR" property="cameras"/>
         <result column="therm" jdbcType="INTEGER" property="therm"/>
         <result column="horn" jdbcType="INTEGER" property="horn"/>
         <result column="mike" jdbcType="INTEGER" property="mike"/>
@@ -148,6 +148,12 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-annotation</artifactId>
+            <version>3.4.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 package com.ruoyi.common.core.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
 /**
  * Entity基类
@@ -19,6 +21,7 @@ public class BaseEntity implements Serializable
     /** 搜索值 */
     @JsonIgnore
+    @TableField(exist = false)
     private String searchValue;
     /** 创建者 */
@@ -36,10 +39,12 @@ public class BaseEntity implements Serializable
     private Date updateTime;
     /** 备注 */
+    @TableField(exist = false)
     private String remark;
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
     private Map<String, Object> params;
     public String getSearchValue()
+package com.ruoyi.common.core.domain;
+
+import com.ruoyi.common.constant.HttpStatus;
+
+import java.util.Objects;
+
+/**
+ * @author liujun
+ * @date 2024年07月12日 11:33
+ */
+public class ResponseResult <T>{
+    private int code= 500;
+    private String msg;
+    private T data;
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public ResponseResult()
+    {
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     *
+     * @param code 状态码
+     * @param msg 返回内容
+     */
+    public ResponseResult(int code, String msg)
+    {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     *
+     * @param code 状态码
+     */
+    public ResponseResult(int code)
+    {
+        this.code = code;
+    }
+
+    /**
+     * 初始化一个新创建的 AjaxResult 对象
+     *
+     * @param code 状态码
+     * @param msg 返回内容
+     * @param data 数据对象
+     */
+    public ResponseResult(int code, String msg, T data)
+    {
+        this.code = code;
+        this.msg = msg;
+        this.data= data;
+
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @return 成功消息
+     */
+    public static <T>ResponseResult<T> success()
+    {
+        return ResponseResult.success("操作成功");
+    }
+
+    /**
+     * 返回成功数据
+     *
+     * @return 成功消息
+     */
+    public static <T>ResponseResult<T> success(T data)
+    {
+        return ResponseResult.success("操作成功", data);
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @param msg 返回内容
+     * @return 成功消息
+     */
+    public static <T>ResponseResult<T> success(String msg)
+    {
+        return ResponseResult.success(msg, null);
+    }
+
+    /**
+     * 返回成功消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 成功消息
+     */
+    public static <T>ResponseResult<T> success(String msg, T data)
+    {
+        return new ResponseResult(HttpStatus.SUCCESS, msg, data);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @return 警告消息
+     */
+    public static <T>ResponseResult<T> warn(String msg)
+    {
+        return ResponseResult.warn(msg, null);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 警告消息
+     */
+    public static <T>ResponseResult<T> warn(String msg, Object data)
+    {
+        return new ResponseResult(HttpStatus.WARN, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @return 错误消息
+     */
+    public static <T>ResponseResult<T> error()
+    {
+        return ResponseResult.error("操作失败");
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static <T>ResponseResult<T> error(String msg)
+    {
+        return ResponseResult.error(msg, null);
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 错误消息
+     */
+    public static <T>ResponseResult<T> error(String msg, Object data)
+    {
+        return new ResponseResult(HttpStatus.ERROR, msg, data);
+    }
+
+    /**
+     * 返回错误消息
+     *
+     * @param code 状态码
+     * @param msg 返回内容
+     * @return 错误消息
+     */
+    public static <T>ResponseResult<T> error(int code, String msg)
+    {
+        return new ResponseResult(code, msg, null);
+    }
+
+    /**
+     * 是否为成功消息
+     *
+     * @return 结果
+     */
+    public boolean isSuccess()
+    {
+        return Objects.equals(HttpStatus.SUCCESS, this.getCode());
+    }
+
+    /**
+     * 是否为警告消息
+     *
+     * @return 结果
+     */
+    public boolean isWarn()
+    {
+        return Objects.equals(HttpStatus.WARN,this.getCode());
+    }
+
+    /**
+     * 是否为错误消息
+     *
+     * @return 结果
+     */
+    public boolean isError()
+    {
+        return Objects.equals(HttpStatus.ERROR,this.getCode());
+    }
+
+
+
+}
 package com.ruoyi.common.utils.file;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Paths;
-import java.util.Objects;
-import org.apache.commons.io.FilenameUtils;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException;
 import com.ruoyi.common.exception.file.FileSizeLimitExceededException;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.common.utils.uuid.Seq;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Paths;
+import java.util.Objects;
 /**
  * 文件上传工具类
  *
  * @author ruoyi
  */
-public class FileUploadUtils
-{
+public class FileUploadUtils {
+    private final static Logger LOGGER = LoggerFactory.getLogger(FileUploadUtils.class);
     /**
      * 默认大小 50M
      */
@@ -37,13 +48,11 @@ public class FileUploadUtils
      */
     private static String defaultBaseDir = RuoYiConfig.getProfile();
-    public static void setDefaultBaseDir(String defaultBaseDir)
-    {
+    public static void setDefaultBaseDir(String defaultBaseDir) {
         FileUploadUtils.defaultBaseDir = defaultBaseDir;
     }
-    public static String getDefaultBaseDir()
-    {
+    public static String getDefaultBaseDir() {
         return defaultBaseDir;
     }
@@ -54,14 +63,10 @@ public class FileUploadUtils
      * @return 文件名称
      * @throws Exception
      */
-    public static final String upload(MultipartFile file) throws IOException
-    {
-        try
-        {
+    public static final String upload(MultipartFile file) throws IOException {
+        try {
             return upload(getDefaultBaseDir(), file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             throw new IOException(e.getMessage(), e);
         }
     }
@@ -70,18 +75,14 @@ public class FileUploadUtils
      * 根据文件路径上传
      *
      * @param baseDir 相对应用的基目录
-     * @param file 上传的文件
+     * @param file    上传的文件
      * @return 文件名称
      * @throws IOException
      */
-    public static final String upload(String baseDir, MultipartFile file) throws IOException
-    {
-        try
-        {
+    public static final String upload(String baseDir, MultipartFile file) throws IOException {
+        try {
             return upload(baseDir, file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             throw new IOException(e.getMessage(), e);
         }
     }
@@ -89,22 +90,20 @@ public class FileUploadUtils
     /**
      * 文件上传
      *
-     * @param baseDir 相对应用的基目录
-     * @param file 上传的文件
+     * @param baseDir          相对应用的基目录
+     * @param file             上传的文件
      * @param allowedExtension 上传文件类型
      * @return 返回上传成功的文件名
-     * @throws FileSizeLimitExceededException 如果超出最大大小
+     * @throws FileSizeLimitExceededException       如果超出最大大小
      * @throws FileNameLengthLimitExceededException 文件名太长
-     * @throws IOException 比如读写文件出错时
-     * @throws InvalidExtensionException 文件校验异常
+     * @throws IOException                          比如读写文件出错时
+     * @throws InvalidExtensionException            文件校验异常
      */
     public static final String upload(String baseDir, MultipartFile file, String[] allowedExtension)
             throws FileSizeLimitExceededException, IOException, FileNameLengthLimitExceededException,
-            InvalidExtensionException
-    {
+            InvalidExtensionException {
         int fileNamelength = Objects.requireNonNull(file.getOriginalFilename()).length();
-        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH)
-        {
+        if (fileNamelength > FileUploadUtils.DEFAULT_FILE_NAME_LENGTH) {
             throw new FileNameLengthLimitExceededException(FileUploadUtils.DEFAULT_FILE_NAME_LENGTH);
         }
@@ -117,31 +116,77 @@ public class FileUploadUtils
         return getPathFileName(baseDir, fileName);
     }
+    /***
+     * 上传Base64内容的文件
+     * @author liujun
+     * @date 2024/7/12 9:18
+     * @param filePath 上传的路径
+     * @param fileName  上传文件名称
+     * @param type  文件类型
+     * @param uploadContent 文件内容
+     *
+     * @return ResponseResult  文件上传成功返回文件路径；上传异常返回500；文件超大返回1；不是图片返回2
+     */
+    public static ResponseResult<String> uploadBase64OfImage(String filePath, String fileName, String type, String uploadContent) {
+        ByteArrayInputStream byteArrayInputStream = null;
+        BufferedImage bufferedImage = null;
+        try {
+            File file = new File(filePath);
+            if (!file.isDirectory()) {
+                FileUtils.forceMkdir(file);
+            }
+            byte[] content = Base64.decode(uploadContent);
+            if (ArrayUtils.getLength(content) > DEFAULT_MAX_SIZE) {
+                LOGGER.info("[{}]上传的图片超过了50M", filePath);
+                return new ResponseResult<>(1);
+            }
+            byteArrayInputStream = new ByteArrayInputStream(content);
+            bufferedImage = ImageIO.read(byteArrayInputStream);
+            if (Objects.isNull(bufferedImage)) {
+                LOGGER.info("[{}]上传的不是图片", filePath);
+                return new ResponseResult<>(2);
+            }
+
+
+            StringBuilder path = new StringBuilder();
+            path.append(filePath);
+            path.append(File.separator);
+            path.append(fileName);
+            path.append(".");
+            path.append(type);
+
+            boolean flag = ImageIO.write(bufferedImage, type, new File(path.toString()));
+            bufferedImage.flush();
+
+            return flag ? ResponseResult.success(path.toString()) : new ResponseResult<>(500);
+        } catch (Exception e) {
+            LOGGER.error("上传图片异常,上传的路径为:[{}]", filePath);
+        } finally {
+            IOUtils.closeQuietly(byteArrayInputStream);
+        }
+        return new ResponseResult<>(500);
+    }
+
     /**
      * 编码文件名
      */
-    public static final String extractFilename(MultipartFile file)
-    {
+    public static final String extractFilename(MultipartFile file) {
         return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(),
                 FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), getExtension(file));
     }
-    public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException
-    {
+    public static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException {
         File desc = new File(uploadDir + File.separator + fileName);
-        if (!desc.exists())
-        {
-            if (!desc.getParentFile().exists())
-            {
+        if (!desc.exists()) {
+            if (!desc.getParentFile().exists()) {
                 desc.getParentFile().mkdirs();
             }
         }
         return desc;
     }
-    public static final String getPathFileName(String uploadDir, String fileName) throws IOException
-    {
+    public static final String getPathFileName(String uploadDir, String fileName) throws IOException {
         int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
         return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
@@ -156,40 +201,28 @@ public class FileUploadUtils
      * @throws InvalidExtensionException
      */
     public static final void assertAllowed(MultipartFile file, String[] allowedExtension)
-            throws FileSizeLimitExceededException, InvalidExtensionException
-    {
+            throws FileSizeLimitExceededException, InvalidExtensionException {
         long size = file.getSize();
-        if (size > DEFAULT_MAX_SIZE)
-        {
+        if (size > DEFAULT_MAX_SIZE) {
             throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024);
         }
         String fileName = file.getOriginalFilename();
         String extension = getExtension(file);
-        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension))
-        {
-            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION)
-            {
+        if (allowedExtension != null && !isAllowedExtension(extension, allowedExtension)) {
+            if (allowedExtension == MimeTypeUtils.IMAGE_EXTENSION) {
                 throw new InvalidExtensionException.InvalidImageExtensionException(allowedExtension, extension,
                         fileName);
-            }
-            else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION)
-            {
+            } else if (allowedExtension == MimeTypeUtils.FLASH_EXTENSION) {
                 throw new InvalidExtensionException.InvalidFlashExtensionException(allowedExtension, extension,
                         fileName);
-            }
-            else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION)
-            {
+            } else if (allowedExtension == MimeTypeUtils.MEDIA_EXTENSION) {
                 throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
                         fileName);
-            }
-            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
-            {
+            } else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION) {
                 throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
                         fileName);
-            }
-            else
-            {
+            } else {
                 throw new InvalidExtensionException(allowedExtension, extension, fileName);
             }
         }
@@ -202,12 +235,9 @@ public class FileUploadUtils
      * @param allowedExtension
      * @return
      */
-    public static final boolean isAllowedExtension(String extension, String[] allowedExtension)
-    {
-        for (String str : allowedExtension)
-        {
-            if (str.equalsIgnoreCase(extension))
-            {
+    public static final boolean isAllowedExtension(String extension, String[] allowedExtension) {
+        for (String str : allowedExtension) {
+            if (str.equalsIgnoreCase(extension)) {
                 return true;
             }
         }
@@ -220,13 +250,12 @@ public class FileUploadUtils
      * @param file 表单文件
      * @return 后缀名
      */
-    public static final String getExtension(MultipartFile file)
-    {
+    public static final String getExtension(MultipartFile file) {
         String extension = FilenameUtils.getExtension(file.getOriginalFilename());
-        if (StringUtils.isEmpty(extension))
-        {
+        if (StringUtils.isEmpty(extension)) {
             extension = MimeTypeUtils.getExtension(Objects.requireNonNull(file.getContentType()));
         }
         return extension;
     }
+
 }
@@ -20,6 +20,8 @@ import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter;
 import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl;
 import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl;
+import javax.annotation.Resource;
+
 /**
  * spring security配置
  * 
@@ -31,8 +33,10 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
     /**
      * 自定义用户认证逻辑
      */
-    @Autowired
+    @Resource(name="com.ruoyi.service.impl.LingGangUserDetailsServiceImpl")
     private UserDetailsService userDetailsService;
+
+
     /**
      * 认证失败处理类
@@ -24,6 +24,8 @@ public interface ISysDictDataService extends IService&lt;SysDictData&gt; {
     List<SysDictData> queryDictDateList(SysDictData dictData, Collection<String> types);
+    SysDictData getOne(SysDictData sysDictData);
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *
@@ -49,6 +49,12 @@ public class SysDictDataServiceImpl extends ServiceImpl&lt;SysDictDataMapper, SysDi
         return list(wrapper);
     }
+    @Override
+    public SysDictData getOne(SysDictData sysDictData) {
+        LambdaQueryWrapper<SysDictData> wrapper = new LambdaQueryWrapper<>(sysDictData);
+        return getOne(wrapper);
+    }
+
     /**
      * 根据字典类型和字典键值查询字典数据信息
      *