设备和场地

liujun001
1 parent f869756e
Showing 21 changed files with 338 additions and 96 deletions
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/domain/driver/NewDriver.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/login/dto/LoginDriverDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/FaceRegisterDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/ReqDataDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/dto/ResDataDriveDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/dss/syn/res/vo/ReqDataVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/car/info/dto/GetPlatesDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/EquipmentAuthDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/EquipmentSelfcheckDto.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/ExKeysDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/dto/HeartbeatDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/equipment/vo/EquipmentConfigVo.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/key/location/dto/WorkPlateV2DTO.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/DssSignOutDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/equipment/self/check/LingangEquimentSelfCheck.java
Bsth-admin/src/main/java/com/ruoyi/domain/key/info/box/dto/KeyBoxQueryDTO.java
Bsth-admin/src/main/java/com/ruoyi/expand/domain/DriverSchedulingExpand.java
@@ -134,7 +134,9 @@ public class DssEquipmentController extends BaseController {
         sysDictData.setStatus(Constants.ENABLE_STR);
         List<SysDictData> list = sysDictDataService.queryDictDateList(sysDictData, keys);
-        EquipmentConfigVo configVo = combitionEquipmentConfigVo(list);
+        Equipment equipment = equipmentService.getOneByDeviceId(device);
+
+        EquipmentConfigVo configVo = combitionEquipmentConfigVo(list,equipment);
         return ResponseResult.success(configVo);
     }
@@ -179,7 +181,7 @@ public class DssEquipmentController extends BaseController {
         return heartbeat;
     }
-    private EquipmentConfigVo combitionEquipmentConfigVo(List<SysDictData> sysDictDatas) {
+    private EquipmentConfigVo combitionEquipmentConfigVo(List<SysDictData> sysDictDatas, Equipment equipment) {
         if (CollectionUtils.isEmpty(sysDictDatas)) {
             return null;
         }
@@ -198,15 +200,15 @@ public class DssEquipmentController extends BaseController {
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "timespan")) {
                     equimentVideoParamVo.setTimespan(Convert.toInt(sysDictData.getDictValue()));
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "url")) {
-                    equimentVideoParamVo.setUrl(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
+                    equimentVideoParamVo.setUrl(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "saveday")) {
                     equimentVideoParamVo.setSaveday(Convert.toInt(sysDictData.getDictValue()));
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "videoTimeSlot")) {
-                    equimentVideoParamVo.setVideoTimeSlot(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
+                    equimentVideoParamVo.setVideoTimeSlot(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
                 }
             } else if (Objects.equals(sysDictData.getDictType(), "addressParam") && Objects.nonNull(sysDictData.getDictValue())) {
                 if (StringUtils.equals(sysDictData.getDiscKey(), "upgradeAddress")) {
-                    equimentAddressParamVo.setUpgradeAddress(Objects.nonNull(sysDictData.getDictValue())?sysDictData.getDictValue().toString():null);
+                    equimentAddressParamVo.setUpgradeAddress(Objects.nonNull(sysDictData.getDictValue()) ? sysDictData.getDictValue().toString() : null);
                 } else if (StringUtils.equals(sysDictData.getDiscKey(), "integer")) {
                     equimentAddressParamVo.setInteger(Convert.toInt(sysDictData.getDictValue()));
                 }
@@ -215,6 +217,10 @@ public class DssEquipmentController extends BaseController {
         configVo.setAddressParam(equimentAddressParamVo);
         configVo.setVideoParam(equimentVideoParamVo);
+
+        int moodCheck = Objects.isNull(equipment) ? null : StringUtils.endsWith(equipment.getPromise(), ",4") || StringUtils.startsWith(equipment.getPromise(), "4,")
+                || StringUtils.indexOf(equipment.getPromise(), ",4,") > -1 ? 1 : 0;
+        configVo.setMoodCheck(moodCheck);
         return configVo;
     }
@@ -223,8 +229,8 @@ public class DssEquipmentController extends BaseController {
         BeanUtils.copyProperties(dto, selfCheck);
         if (CollectionUtils.isNotEmpty(dto.getCameras())) {
             selfCheck.setCameras(JSON.toJSONString(dto.getCameras()));
-           Optional<EquipmentSelfcheckCamerasDto> optional =  dto.getCameras().stream().filter(c->Objects.equals(c.getStatus(),1)).findFirst();
-           selfCheck.setCamerasSaveExceptionFlag(optional.isPresent());
+            Optional<EquipmentSelfcheckCamerasDto> optional = dto.getCameras().stream().filter(c -> Objects.equals(c.getStatus(), 1)).findFirst();
+            selfCheck.setCamerasSaveExceptionFlag(optional.isPresent());
         }
         return selfCheck;
 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.ResponseResult;
@@ -9,8 +10,10 @@ 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.ReqDataDTO;
 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.res.vo.ReqDataVo;
 import com.ruoyi.domain.driver.dss.syn.vo.DssDriveVo;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.FaceService;
@@ -18,6 +21,7 @@ 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;
@@ -36,7 +40,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
-@RequestMapping("/dss/Driver")
+@RequestMapping("/dss")
 @Api(tags = "【蓝斯一期】人脸信息")
 public class DssFaceController extends BaseController {
@@ -45,7 +49,19 @@ public class DssFaceController extends BaseController {
     @Autowired
     private FaceService faceService;
-    @PostMapping("/syn/reqData")
+    @ApiOperation(value = "05.终端同步人脸数据")
+    @PostMapping(value = "/face/syn/reqData")
+    public ResponseResult<List<ReqDataVo>> reqData(@Valid @RequestBody ReqDataDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
+
+        List<NewDriver> drivers = newDriverService.list();
+        List<ReqDataVo> vos = convertReqDataVo(drivers);
+        return ResponseResult.success(vos);
+    }
+
+    @PostMapping("/Driver/syn/reqData")
     @ApiOperation("获取数据库人员信息")
     public List<DssDriveVo> queryDriver(@Valid @RequestBody DssDriveQueryDTO dto, BindingResult bindingResult) {
@@ -54,29 +70,29 @@ public class DssFaceController extends BaseController {
     }
     @ApiOperation("终端同步人脸数据结果上报")
-    @PostMapping(value = "/syn/resData")
+    @PostMapping(value = "/face/syn/resData")
     public ResponseResult<Object> insertDriver(@Valid @RequestBody ResDataDriveDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         NewDriver newDriver = convertNewDriver(dto);
         TipEnum errorTipEnum = newDriverService.updateClient(newDriver);
-        return new ResponseResult<>(errorTipEnum.getCode(),errorTipEnum.getMsg());
+        return new ResponseResult<>(errorTipEnum.getCode(), errorTipEnum.getMsg());
     }
     @ApiOperation(("人脸注册"))
-    @PostMapping(value = "FaceRegister")
+    @PostMapping(value = "/Driver/FaceRegister")
     public ResponseResult<Object> faceRegister(@Valid @RequestBody FaceRegisterDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
         NewDriver newDriver = convertFaceRegister(dto);
         TipEnum errorTipEnum = newDriverService.faceRegister(newDriver);
-        return new ResponseResult<>(errorTipEnum.getCode(),errorTipEnum.getMsg());
+        return new ResponseResult<>(errorTipEnum.getCode(), errorTipEnum.getMsg());
     }
     @ApiOperation("人脸校验")
-    @PostMapping(value = "FaceCheck")
+    @PostMapping(value = "/Driver/FaceCheck")
     public ResponseResult<FaceCheckVo> faceCheck(@Valid @RequestBody FaceCheckDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
@@ -118,8 +134,8 @@ public class DssFaceController extends BaseController {
     private NewDriver convertNewDriver(ResDataDriveDTO dto) {
         NewDriver newDriver = new NewDriver();
         newDriver.setJobCode(dto.getStaffId());
-//        newDriver.setPersonnelName(dto.getStaffName());
-//        newDriver.setIcCardCode(dto.getIcCardNo());
+        newDriver.setPersonnelName(dto.getStaffName());
+        newDriver.setIcCardCode(dto.getIcCardNo());
         newDriver.setImage(dto.getFacePhotoPath());
         newDriver.setFaceFeature(dto.getFaceFeature());
         newDriver.setBlueTooth(dto.getBlueTooth());
@@ -127,7 +143,7 @@ public class DssFaceController extends BaseController {
         newDriver.setSyncontent((dto.getSynContent()));
         newDriver.setCsn(dto.getCsn());
-        return null;
+        return newDriver;
     }
     private NewDriver convertFaceRegister(FaceRegisterDTO dto) {
@@ -153,6 +169,100 @@ public class DssFaceController extends BaseController {
         return faceCheckVo;
     }
+    private List<ReqDataVo> convertReqDataVo(List<NewDriver> drivers){
+        if(CollectionUtils.isEmpty(drivers)){
+            return Collections.emptyList();
+        }
+        return drivers.stream().map(d->{
+            ReqDataVo vo = new ReqDataVo();
+            vo.setVersionNo(Convert.toStr(d.getImageVersion()));
+            vo.setStaffId(Convert.toStr(d.getId()));
+            vo.setStaffName(d.getPersonnelName());
+            vo.setIcCardNo(d.getIcCardCode());
+            vo.setFacePhotoPath(d.getImage());
+            vo.setFaceFeature(vo.getFaceFeature());
+            vo.setStaffCode(d.getJobCode());
+//            vo.setSynState(d.getS)
+            vo.setSynContent(d.getSyncontent());
+
+            vo.setStaffTypeItem(switchPostion(d.getPosts()));
+
+            return vo;
+        }).collect(Collectors.toList());
+    }
+
+    private Set<Integer> switchPostion(String post){
+
+        Set<Integer> postSet = new LinkedHashSet<>();
+        if(StringUtils.indexOf(post,"驾驶员") > -1){
+            postSet.add(2);
+        }
+
+        if(StringUtils.indexOf(post,"集调中心") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"稽查") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"行管员") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"副队长") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"调度") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"科员") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"队长") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"车队支部书记") > -1){
+            postSet.add(3);
+        }
+
+
+        if(StringUtils.indexOf(post,"部门副经理") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"副总经理") > -1){
+            postSet.add(3);
+        }
+
+
+        if(StringUtils.indexOf(post,"部门经理") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"办公室主任") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"办公室副主任") > -1){
+            postSet.add(3);
+        }
+
+        if(StringUtils.indexOf(post,"工会副主席") > -1){
+            postSet.add(3);
+        }
+
+
+        if(CollectionUtils.isEmpty(postSet)){
+            postSet.add(1);
+        }
+
+        return postSet;
+    }
 }
@@ -18,101 +18,98 @@ import lombok.extern.slf4j.Slf4j;
 public class NewDriver {
     /***主键*/
     @Excel(name = "主键")
-    private Integer id;
+    private java.lang.Integer id;
     /***工号*/
     @TableId(value = "job_code", type = IdType.AUTO)
     @Excel(name = "工号")
-    private String jobCode;
+    private java.lang.String jobCode;
     /***公司编码*/
     @Excel(name = "公司编码")
-    private String companyCode;
+    private java.lang.String companyCode;
     /***分公司编码*/
     @Excel(name = "分公司编码")
-    private String brancheCompanyCode;
+    private java.lang.String brancheCompanyCode;
     /***姓名*/
     @Excel(name = "姓名")
-    private String personnelName;
+    private java.lang.String personnelName;
     /***运营服务证书号*/
     @Excel(name = "运营服务证书号")
-    private String papersCode;
+    private java.lang.String papersCode;
     /***一卡通工作卡号*/
     @Excel(name = "一卡通工作卡号")
-    private String icCardCode;
+    private java.lang.String icCardCode;
     /***性别*/
     @Excel(name = "性别")
-    private String personnelType;
+    private java.lang.String personnelType;
     /***所属岗位/工种*/
     @Excel(name = "所属岗位/工种")
-    private String posts;
+    private java.lang.String posts;
     /***身份证*/
     @Excel(name = "身份证")
-    private String card;
+    private java.lang.String card;
     /***联系电话*/
     @Excel(name = "联系电话")
-    private String telphone;
+    private java.lang.String telphone;
     /***RFID 人卡IC号*/
     @Excel(name = "RFID 人卡IC号")
-    private String icRfid;
+    private java.lang.String icRfid;
     /***RFID 人卡ID号（10进制）*/
     @Excel(name = "RFID 人卡ID号（10进制）")
-    private String idRfid;
+    private java.lang.String idRfid;
     /***RFID 标签号*/
     @Excel(name = "RFID 标签号")
-    private String tagRfid;
+    private java.lang.String tagRfid;
     /***备注*/
     @Excel(name = "备注")
-    private String remark;
+    private java.lang.String remark;
     /***线路名称*/
     @Excel(name = "线路名称")
-    private String lineName;
+    private java.lang.String lineName;
     /***线路编码*/
     @Excel(name = "线路编码")
-    private String lineCode;
+    private java.lang.String lineCode;
     /***是否进行人脸注册 1 注册 2 未注册*/
     @Excel(name = "是否进行人脸注册 1 注册 2 未注册")
-    private Integer faceSignIn;
+    private java.lang.Integer faceSignIn;
     /***头像*/
     @Excel(name = "头像")
-    private String image;
-
-    @TableField(exist = false)
-    private float imageScore;
+    private java.lang.String image;
     /***更新日期*/
@@ -122,12 +119,12 @@ public class NewDriver {
     /***注册设备列表*/
     @Excel(name = "注册设备列表")
-    private String signInEquipment;
+    private java.lang.String signInEquipment;
     /***车队名称*/
     @Excel(name = "车队名称")
-    private String fleetName;
+    private java.lang.String fleetName;
     /***人脸识别特征*/
@@ -142,6 +139,7 @@ public class NewDriver {
     /***同步结果状态;0成功，1失败*/
     @Excel(name = "同步结果状态;0成功，1失败")
+    @TableField(value = "`integer`")
     private java.lang.Integer integer;
@@ -155,6 +153,14 @@ public class NewDriver {
     private java.lang.String csn;
+    /***图片版本号*/
+    @Excel(name = "图片版本号")
+    private java.lang.Integer imageVersion;
+
+    @TableField(exist = false)
+    private float imageScore;
+
+
     @Override
     public String toString() {
         return com.alibaba.fastjson2.JSON.toJSONString(this);
@@ -8,7 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 /**
@@ -22,15 +22,15 @@ import java.util.Date;
 public class LoginDriverDTO implements java.io.Serializable {
     private static final long serialVersionUID = -1677262685203673206L;
-    @NotNull(message = "设备上线号不能为空")
+    @NotEmpty(message = "设备上线号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "登录校验类型不能为空")
+    @NotEmpty(message = "登录校验类型不能为空")
     @ApiModelProperty(value = "登录校验类型;0:卡号登录，1:人脸登录", required = true)
     private String authType;
-    @NotNull(message = "登录校验信息 不能为空")
+    @NotEmpty(message = "登录校验信息 不能为空")
     @ApiModelProperty(value = "登录校验类型; 登录校验信息 卡号或人脸图片数据，图片数据格式为BASE64", required = true)
     private String authValue;
@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 /**
@@ -26,17 +26,17 @@ import java.util.Date;
 public class FaceRegisterDTO implements java.io.Serializable {
     private static final long serialVersionUID = 228485023686482474L;
-    @NotNull(message = "设备上线号 不能为空")
+    @NotEmpty(message = "设备上线号 不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "IC卡号 不能为空")
+    @NotEmpty(message = "IC卡号 不能为空")
     @ApiModelProperty(value = "IC卡号", required = true)
     private String driverCode;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "时间")
     private Date regTime;
-    @NotNull(message = "人脸图片数据 不能为空")
+    @NotEmpty(message = "人脸图片数据 不能为空")
     @ApiModelProperty(value = "人脸图片数据", required = true)
     private String faceValue;
+package com.ruoyi.domain.driver.dss.syn.res.dto;
+
+import com.alibaba.fastjson2.JSON;
+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;
+
+/**
+ * @author liujun
+ * @date 2024年07月29日 16:56
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "终端同步人脸数据 DTO")
+@EqualsAndHashCode(callSuper = false)
+public class ReqDataDTO implements java.io.Serializable {
+
+    private static final long serialVersionUID = 7218144455404373395L;
+
+    @NotEmpty(message = "设备号不能为空")
+    @ApiModelProperty(value = "设备上线号", required = true)
+    private String device;
+    @NotEmpty(message = "设备ID不能为空")
+    @ApiModelProperty(value = "设备ID", required = true)
+    private String deviceId;
+    @ApiModelProperty(value = "终端人脸数据版本 null终端无记录", required = true)
+    private String versionNo;
+
+    @Override
+    public String toString() {
+        return JSON.toJSONString(this);
+    }
+}
@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Set;
@@ -25,19 +26,19 @@ import java.util.Set;
 public class ResDataDriveDTO implements java.io.Serializable {
     private static final long serialVersionUID = -815323242596921313L;
-    @NotNull(message = "服务器人脸信息版本号不能为空")
+    @NotEmpty(message = "服务器人脸信息版本号不能为空")
     @ApiModelProperty(value = "服务器人脸信息版本号", required = true)
     private String versionNo;
-    @NotNull(message = "设备上线号不能为空")
+    @NotEmpty(message = "设备上线号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "设备ID不能为空")
+    @NotEmpty(message = "设备ID不能为空")
     @ApiModelProperty(value = "设备ID", required = true)
     private String deviceId;
-    @NotNull(message = "员工id不能为空")
+    @NotEmpty(message = "员工id不能为空")
     @ApiModelProperty(value = "员工id", required = true)
     private String staffId;
     @ApiModelProperty(value = "员工姓名")
@@ -57,11 +58,11 @@ public class ResDataDriveDTO implements java.io.Serializable {
     @ApiModelProperty(value = "同步结果状态;0成功，1失败", required = true, example = "1")
     private Integer integer;
-    @NotNull(message = "同步内容不能为空")
+    @NotEmpty(message = "同步内容不能为空")
     @ApiModelProperty(value = "同步内容", required = true)
     private String synContent;
-    @NotNull(message = "物理卡号不能为空")
+    @NotEmpty(message = "物理卡号不能为空")
     @ApiModelProperty(value = "物理卡号", required = true)
     private String csn;
+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;
+
+import java.util.Set;
+
+/**
+ * @author liujun
+ * @date 2024年07月29日 17:01
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@ApiModel(value = "终端同步人脸数据 Vo")
+@EqualsAndHashCode(callSuper = false)
+public class ReqDataVo implements java.io.Serializable {
+
+    private static final long serialVersionUID = -4791224929481921281L;
+    @ApiModelProperty(value = "服务器人脸信息版本号")
+    private String versionNo;
+    @ApiModelProperty(value = "员工id")
+    private String staffId;
+    @ApiModelProperty(value = "员工姓名")
+    private String staffName;
+    @ApiModelProperty(value = "IC卡号")
+    private String icCardNo;
+    @ApiModelProperty(value = "原始图片地址")
+    private String facePhotoPath;
+    @ApiModelProperty(value = "解析后的访问图片地址")
+    private String cropFacePhotoUrl;
+    @ApiModelProperty(value = "人脸识别特征值")
+    private String faceFeature;
+    @ApiModelProperty(value = "手环mac地址")
+    private String blueTooth;
+    @ApiModelProperty(value = "工号")
+    private String staffCode;
+    @ApiModelProperty(value = "同步状态")
+    private Integer synState;
+    @ApiModelProperty(value = "同步内容")
+    private String synContent;
+    @ApiModelProperty(value = "物理卡号")
+    private String csn;
+    @ApiModelProperty(value = "角色类型   1:员工  2:驾驶员 3管理员 4移车员")
+    private Set<Integer> staffTypeItem;
+}
@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 /**
  * @author liujun
@@ -25,7 +25,7 @@ public class GetPlatesDTO implements java.io.Serializable {
     @ApiModelProperty(value = "模糊查询参数，null返回data=nul")
     private String plate;
-    @NotNull(message = "设备上线号不能为空")
+    @NotEmpty(message = "设备上线号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 /**
@@ -19,7 +19,8 @@ import java.util.Date;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class EquipmentAuthDTO {
-    @NotNull(message = "设备号不能为空")
+
+    @NotEmpty(message = "设备号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
     @ApiModelProperty(value = "获取token设备时间", required = true)
@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
@@ -25,11 +26,11 @@ public class EquipmentSelfcheckDto implements java.io.Serializable {
     private static final long serialVersionUID = 1874941263694729359L;
-    @NotNull(message = "设备上线号不能为空")
+    @NotEmpty(message = "设备上线号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "设备应用版本号不能为空")
+    @NotEmpty(message = "设备应用版本号不能为空")
     @ApiModelProperty(value = "设备应用版本号", required = true)
     @JsonProperty("app_version")
     private String appVersion;
@@ -58,7 +59,7 @@ public class EquipmentSelfcheckDto implements java.io.Serializable {
     private Date time;
     @ApiModelProperty(value = "设备类型")
-    private String deviceTyp;
+    private String deviceType;
     @ApiModelProperty(value = "是否拥有钥匙柜外设:null/0:否，1:是", example = "1")
     private Integer isKeybox;
@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 /**
@@ -20,7 +21,7 @@ import javax.validation.constraints.NotNull;
 public class ExKeysDTO implements java.io.Serializable {
     private static final long serialVersionUID = -6900289229012374739L;
-    @NotNull(message = "设备号不能为空")
+    @NotEmpty(message = "设备号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
     @NotNull(message = "钥匙位号不能为空")
@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
@@ -25,7 +26,7 @@ public class HeartbeatDTO implements java.io.Serializable {
     private static final long serialVersionUID = 5168784920496912635L;
-    @NotNull(message = "设备号不能为空")
+    @NotEmpty(message = "设备号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
@@ -24,8 +24,22 @@ import java.math.BigDecimal;
 public class EquipmentConfigVo implements java.io.Serializable {
     private static final long serialVersionUID = -3893021736941993364L;
+    @ApiModelProperty(value = "是否开启")
     private Integer promiseSwitch;
+    @ApiModelProperty(value = "是否开启健康检测 0：不开启  1：开启",example = "1")
+    private Integer healthCheck;
+
+    @ApiModelProperty(value = "是否开启情绪检测 0：不开启  1：开启",example = "1")
+    private Integer moodCheck;
+
+    @ApiModelProperty(value = "是否开启安全考试 0：不开启  1：开启",example = "1")
+    private Integer safetyExam;
+
+    @ApiModelProperty(value = "开启体温检测 0：不开启  1：开启",example = "1")
+    private Integer temperatureSwitch;
+
+
     @ApiModelProperty(value = "饮酒限制值")
     private BigDecimal drinking;
     @ApiModelProperty(value = "醉酒限制值")
@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -20,16 +21,16 @@ import java.util.Date;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class WorkPlateV2DTO {
-    @NotNull(message = "设备上线号不能为空")
+    @NotEmpty(message = "设备上线号不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "设备类型不能为空")
+    @NotEmpty(message = "设备类型不能为空")
     @ApiModelProperty(value = "设备类型上线号", required = true)
     private String deviceType;
-    @NotNull(message = "卡号不能为空")
+    @NotEmpty(message = "卡号不能为空")
     @ApiModelProperty(value = "卡号", required = true)
     private String driverCode;
-    @NotNull(message = "工号不能为空")
+    @NotEmpty(message = "工号不能为空")
     @ApiModelProperty(value = "工号", required = true)
     private String staffCode;
@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -21,19 +22,19 @@ import java.util.Date;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 public class DssSignDTO {
-    @NotNull(message = "设备上线号 不能为空")
+    @NotEmpty(message = "设备上线号 不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "设备类型 不能为空")
+    @NotEmpty(message = "设备类型 不能为空")
     @ApiModelProperty(value = "设备类型", required = true)
     private String deviceType;
-    @NotNull(message = "司机卡号 不能为空")
+    @NotEmpty(message = "司机卡号 不能为空")
     @ApiModelProperty(value = "司机卡号", required = true)
     private String driverCode;
-    @NotNull(message = "司机工号 不能为空")
+    @NotEmpty(message = "司机工号 不能为空")
     @ApiModelProperty(value = "司机工号", required = true)
     private String staffCode;
@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -24,10 +25,10 @@ public class DssSignOutDTO implements java.io.Serializable {
     private static final long serialVersionUID = 3995970715143952495L;
-    @NotNull(message = "签退设备上线号 不能为空")
+    @NotEmpty(message = "签退设备上线号 不能为空")
     @ApiModelProperty(value = "设备上线号", required = true)
     private String device;
-    @NotNull(message = "签退卡号 不能为空")
+    @NotEmpty(message = "签退卡号 不能为空")
     @ApiModelProperty(value = "卡号")
     private String driverCode;
 package com.ruoyi.domain.equipment.self.check;
-import lombok.Data;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import org.apache.commons.lang3.StringUtils;
+import com.ruoyi.common.annotation.Excel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
-import lombok.NoArgsConstructor;
-import lombok.AllArgsConstructor;
-import com.ruoyi.common.annotation.Excel;
 @Data
@@ -69,6 +68,7 @@ public class LingangEquimentSelfCheck {
     /***锁控状态   1正常，2故障，null/3未检测到*/
     @Excel(name = "锁控状态   1正常，2故障，null/3未检测到")
+    @TableField(value = "`lock`")
     private java.lang.Integer lock;
@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotEmpty;
 /**
  * @author liujun
@@ -20,27 +20,27 @@ import javax.validation.constraints.NotNull;
 public class KeyBoxQueryDTO implements java.io.Serializable {
     private static final long serialVersionUID = -1865377310922939750L;
-    @NotNull(message = "设备号  不能为空")
+    @NotEmpty(message = "设备号  不能为空")
     @ApiModelProperty(value = "设备号", required = true)
     private String device;
-    @NotNull(message = "设备类型 不能为空")
+    @NotEmpty(message = "设备类型 不能为空")
     @ApiModelProperty(value = "设备类型", required = true)
     private String deviceType;
-    @NotNull(message = " 司机卡号不能为空")
+    @NotEmpty(message = " 司机卡号不能为空")
     @ApiModelProperty(value = "司机卡号", required = true)
     private String driverCode;
-    @NotNull(message = "工号 不能为空")
+    @NotEmpty(message = "工号 不能为空")
     @ApiModelProperty(value = "工号", required = true)
     private String staffCode;
-    @NotNull(message = "时间 不能为空")
+    @NotEmpty(message = "时间 不能为空")
     @ApiModelProperty(value = "时间", required = true)
     private String time;
-    @NotNull(message = " 类型 不能为空")
+    @NotEmpty(message = " 类型 不能为空")
     @ApiModelProperty(value = "类型：0签到上报获取，1签退归还获取", required = true)
     private String eventType;
 package com.ruoyi.expand.domain;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.ToString;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.ToString;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 /**
  * 跟班设置对象 driver_scheduling_expand
@@ -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">
-        <id column="id" jdbcType="INTEGER" property="id"/>
-        <result column="job_code" jdbcType="VARCHAR" property="jobCode"/>
+        <id column="job_code" jdbcType="VARCHAR" property="jobCode"/>
+        <result column="id" jdbcType="INTEGER" property="id"/>
         <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"/>
@@ -29,22 +29,24 @@
         <result column="integer" jdbcType="INTEGER" property="integer"/>
         <result column="synContent" jdbcType="VARCHAR" property="syncontent"/>
         <result column="csn" jdbcType="VARCHAR" property="csn"/>
+        <result column="image_version" jdbcType="INTEGER" property="imageVersion"/>
     </resultMap>
     <insert id="insertSelective" keyColumn="job_code" keyProperty="jobCode" useGeneratedKeys="true"
             parameterType="com.ruoyi.domain.driver.NewDriver">
-        INSERT INTO driver <include refid="insertSelectiveColumn"></include>
+        INSERT INTO driver
+        <include refid="insertSelectiveColumn"></include>
         <include refid="insertSelectiveValue"></include>
     </insert>
     <sql id="columns">
         id
-        ,  job_code   ,  company_code   ,  branche_company_code   ,  personnel_name   ,  papers_code   ,  ic_card_code   ,  personnel_type   ,  posts   ,  card   ,  telphone   ,  ic_rfid   ,  id_rfid   ,  tag_rfid   ,  remark   ,  line_name   ,  line_code   ,  face_sign_in   ,  image   ,  update_time   ,  sign_in_equipment   ,  fleet_name   ,  face_Feature   ,  blue_Tooth   ,  integer   ,  synContent   ,  csn
+        ,  job_code   ,  company_code   ,  branche_company_code   ,  personnel_name   ,  papers_code   ,  ic_card_code   ,  personnel_type   ,  posts   ,  card   ,  telphone   ,  ic_rfid   ,  id_rfid   ,  tag_rfid   ,  remark   ,  line_name   ,  line_code   ,  face_sign_in   ,  image   ,  update_time   ,  sign_in_equipment   ,  fleet_name   ,  face_Feature   ,  blue_Tooth   ,  integer   ,  synContent   ,  csn   ,  image_version
     </sql>
     <sql id="insert_columns">
         id
-        ,  job_code  ,  company_code  ,  branche_company_code  ,  personnel_name  ,  papers_code  ,  ic_card_code  ,  personnel_type  ,  posts  ,  card  ,  telphone  ,  ic_rfid  ,  id_rfid  ,  tag_rfid  ,  remark  ,  line_name  ,  line_code  ,  face_sign_in  ,  image  ,  update_time  ,  sign_in_equipment  ,  fleet_name  ,  face_Feature  ,  blue_Tooth  ,  integer  ,  synContent  ,  csn
+        ,  job_code  ,  company_code  ,  branche_company_code  ,  personnel_name  ,  papers_code  ,  ic_card_code  ,  personnel_type  ,  posts  ,  card  ,  telphone  ,  ic_rfid  ,  id_rfid  ,  tag_rfid  ,  remark  ,  line_name  ,  line_code  ,  face_sign_in  ,  image  ,  update_time  ,  sign_in_equipment  ,  fleet_name  ,  face_Feature  ,  blue_Tooth  ,  integer  ,  synContent  ,  csn  ,  image_version
     </sql>
     <sql id="insert_values">
@@ -75,7 +77,8 @@
         #{blueTooth},
         #{integer},
         #{syncontent},
-        #{csn}
+        #{csn},
+        #{imageVersion}
     </sql>
     <sql id="insertSelectiveColumn">
@@ -107,6 +110,7 @@
             <if test="null!=integer">integer,</if>
             <if test="null!=syncontent">synContent,</if>
             <if test="null!=csn">csn,</if>
+            <if test="null!=imageVersion">image_version,</if>
         </trim>
     </sql>
@@ -139,6 +143,7 @@
             <if test="null!=integer">#{integer,jdbcType=INTEGER},</if>
             <if test="null!=syncontent">#{syncontent,jdbcType=VARCHAR},</if>
             <if test="null!=csn">#{csn,jdbcType=VARCHAR},</if>
+            <if test="null!=imageVersion">#{imageVersion,jdbcType=INTEGER},</if>
         </trim>
     </sql>
@@ -171,6 +176,7 @@
             <if test="null!=integer">integer = #{integer,jdbcType=INTEGER},</if>
             <if test="null!=syncontent">synContent = #{syncontent,jdbcType=VARCHAR},</if>
             <if test="null!=csn">csn = #{csn,jdbcType=VARCHAR},</if>
+            <if test="null!=imageVersion">image_version = #{imageVersion,jdbcType=INTEGER},</if>
         </set>
     </sql>
@@ -202,5 +208,6 @@
         <if test="null!=integer">AND integer = #{integer,jdbcType=INTEGER},</if>
         <if test="null!=syncontent">AND synContent = #{syncontent,jdbcType=VARCHAR},</if>
         <if test="null!=csn">AND csn = #{csn,jdbcType=VARCHAR},</if>
+        <if test="null!=imageVersion">AND image_version = #{imageVersion,jdbcType=INTEGER},</if>
     </sql>
 </mapper>
 \ No newline at end of file