设备和场地

liujun001
1 parent ee908e27
Showing 14 changed files with 146 additions and 65 deletions
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssCarInfoController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssDriverController.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/res/dto/FaceCheckDTO.java
Bsth-admin/src/main/java/com/ruoyi/domain/dss/sign/vo/SignOutVo.java
Bsth-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
Bsth-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/pojo/response/SignInResponseVo.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
Bsth-admin/src/main/resources/application-druid-devTest.yml
Bsth-admin/src/main/resources/mapper/driver/NewDriverMapper.xml
Bsth-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -26,13 +26,13 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/dss")
-@Api(tags = "【蓝斯一期】岗前设备报警信息")
+@Api(tags = "【蓝斯一期】车辆信息")
 public class DssCarInfoController {
     @Autowired
     private CarInfoService carInfoService;
     @GetMapping(value = "/device/getPlates")
-    @ApiModelProperty("模糊查询车辆车牌列表")
+    @ApiModelProperty(value="模糊查询车辆车牌列表")
     public ResponseResult<Set<String>> getPlates(@Valid @RequestBody GetPlatesDTO dto, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
@@ -88,11 +88,6 @@ public class DssDriverController extends BaseController {
         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));
     }
@@ -106,10 +101,22 @@ public class DssDriverController extends BaseController {
         SignIn signIn = convertSignIn(dto);
         try {
             AjaxResult ajaxResult = signInService.addSignIn(signIn);
-            if (ajaxResult.isSuccess()) {
+            if (Objects.nonNull(ajaxResult) && ajaxResult.isSuccess()) {
+//                if(Objects.nonNull(ajaxResult.get(AjaxResult.MSG_TAG))){
+//                    String msg = ajaxResult.get(AjaxResult.MSG_TAG).toString();
+//                    if(StringUtils.isNotEmpty(msg)){
+//                        return ResponseResult.error(Convert.toInt(ajaxResult.get(AjaxResult.CODE_TAG)), Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+//                    }
+//                }
+                SysDictData sysDictData = new SysDictData();
+                sysDictData.setDictType("drinking");
+                SysDictData dictData = sysDictDataService.getOne(sysDictData);
+
                 SignInResponseVo responseVo = (SignInResponseVo) ajaxResult.get(AjaxResult.DATA_TAG);
                 if (Objects.nonNull(responseVo)) {
-                    return ResponseResult.success(convertSignInVo(responseVo));
+                    ResponseResult<DssSignVo> responseResult = ResponseResult.success(convertSignInVo(responseVo,dto,dictData));
+                    responseResult.setMsg(Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+                    return  responseResult;
                 }
             }
@@ -132,7 +139,12 @@ public class DssDriverController extends BaseController {
         try {
             AjaxResult ajaxResult = signInService.addSignIn(signIn);
             if (Objects.nonNull(ajaxResult) && ajaxResult.isSuccess()) {
-                return ResponseResult.success(convertSignOutVo(dto));
+                SignInResponseVo responseVo = (SignInResponseVo) ajaxResult.get(AjaxResult.DATA_TAG);
+                if (Objects.nonNull(responseVo)) {
+                    ResponseResult<SignOutVo> responseResult = ResponseResult.success(convertSignOutVo(dto,responseVo));
+                    responseResult.setMsg(Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
+                    return  responseResult;
+                }
             }
             return ResponseResult.error(Convert.toInt(ajaxResult.get(AjaxResult.CODE_TAG)), Convert.toStr(ajaxResult.get(AjaxResult.MSG_TAG)));
@@ -149,6 +161,8 @@ public class DssDriverController extends BaseController {
             return ResponseResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
+
+
         SignIn signIn = convertSignIn(dto);
         SignIn dataSignIn = signInService.getLastOne(signIn);
         return ResponseResult.success(convertGetWineRecordVo(dataSignIn));
@@ -259,7 +273,7 @@ public class DssDriverController extends BaseController {
      */
     private LoginDriverVo convertNewDriver(NewDriver newDriver) {
         LoginDriverVo loginDriverVo = new LoginDriverVo();
-        loginDriverVo.setDriverCode(newDriver.getIcRfid());
+        loginDriverVo.setDriverCode(newDriver.getIcCardCode());
         loginDriverVo.setDriverName(newDriver.getPersonnelName());
         loginDriverVo.setWorkCode(newDriver.getJobCode());
         loginDriverVo.setStaffCode(newDriver.getJobCode());
@@ -289,7 +303,7 @@ public class DssDriverController extends BaseController {
         LoginUserInfoVo loginUserInfoVo = new LoginUserInfoVo();
         loginUserInfoVo.setStaffId(Convert.toStr(newDriver.getId()));
         loginUserInfoVo.setStaffName(newDriver.getPersonnelName());
-        loginUserInfoVo.setIcCardNo(newDriver.getIcRfid());
+        loginUserInfoVo.setIcCardNo(newDriver.getIcCardCode());
         loginUserInfoVo.setFacePhotoPath(newDriver.getImage());
         loginDriverVo.setUserInfo(loginUserInfoVo);
@@ -420,6 +434,14 @@ public class DssDriverController extends BaseController {
         return signIn;
     }
+//    private LinggangScheduling convertLinggangScheduling(DssGetWineRecordDTO dto) {
+//        SignIn signIn = new SignIn();
+//        signIn.setJobCode(dto.getStaffCode());
+//        signIn.setDeviceId(dto.getDevice());
+//
+//        return signIn;
+//    }
+
     private List<LinggangSignInResource> convertLinggangSignInResource(UpLoadPictureDTO dto) {
         if (CollectionUtils.isEmpty(dto.getPicData())) {
             return Collections.emptyList();
@@ -452,12 +474,15 @@ public class DssDriverController extends BaseController {
         return resource;
     }
-    private DssSignVo convertSignInVo(SignInResponseVo responseVo) {
+    private DssSignVo convertSignInVo(SignInResponseVo responseVo,DssSignDTO dto,SysDictData dictData ) {
         DssSignVo vo = new DssSignVo();
         vo.setTestId(Convert.toStr(responseVo.getId()));
         Integer testResult = Objects.equals(responseVo.getExType(), 3) ? 2 : 0;
         vo.setTestResult(testResult);
+        if(Objects.isNull(dictData) || Objects.equals(testResult,0) && dto.getTestValue()>Convert.toLong(dictData.getDictValue())){
+            vo.setTestResult(1);
+        }
         Integer result = Objects.isNull(responseVo.getStatus()) ? 0 : responseVo.getStatus() - 1;
         vo.setResult(result);
@@ -465,8 +490,8 @@ public class DssDriverController extends BaseController {
         return vo;
     }
-    private SignOutVo convertSignOutVo(DssSignOutDTO dto) {
-        return new SignOutVo(dto.getDevice(), dto.getDriverCode(), dto.getLogoutTime());
+    private SignOutVo convertSignOutVo(DssSignOutDTO dto,SignInResponseVo vo) {
+        return new SignOutVo(dto.getDevice(), dto.getDriverCode(), dto.getLogoutTime(),vo.getId());
     }
     private GetWineRecordVo convertGetWineRecordVo(SignIn signIn) {
@@ -133,7 +133,8 @@ public class DssFaceController extends BaseController {
     private NewDriver convertNewDriver(ResDataDriveDTO dto) {
         NewDriver newDriver = new NewDriver();
-        newDriver.setJobCode(dto.getStaffId());
+        newDriver.setId(Convert.toInt(dto.getStaffId()));
+        newDriver.setJobCode(dto.getStaffCode());
         newDriver.setPersonnelName(dto.getStaffName());
         newDriver.setIcCardCode(dto.getIcCardNo());
         newDriver.setImage(dto.getFacePhotoPath());
@@ -142,15 +143,16 @@ public class DssFaceController extends BaseController {
         newDriver.setInteger(dto.getInteger());
         newDriver.setSyncontent((dto.getSynContent()));
         newDriver.setCsn(dto.getCsn());
+        newDriver.setImageVersion(dto.getVersionNo());
         return newDriver;
     }
     private NewDriver convertFaceRegister(FaceRegisterDTO dto) {
         NewDriver newDriver = new NewDriver();
-        newDriver.setIcCardCode(dto.getFaceValue());
+        newDriver.setIcCardCode(dto.getDriverCode());
         newDriver.setFaceSignIn(1);
-        newDriver.setSignInEquipment(dto.getDriverCode());
+        newDriver.setSignInEquipment(dto.getDevice());
         newDriver.setImage(dto.getFaceValue());
         return newDriver;
@@ -155,7 +155,7 @@ public class NewDriver {
     /***图片版本号*/
     @Excel(name = "图片版本号")
-    private java.lang.Integer imageVersion;
+    private java.lang.String imageVersion;
     @TableField(exist = false)
     private float imageScore;
@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 /**
@@ -32,7 +33,7 @@ public class FaceCheckDTO implements java.io.Serializable {
     @ApiModelProperty(value = "IC卡号", required = true)
     private String driverCode;
-    @NotEmpty(message = "时间不能为空")
+    @NotNull(message = "时间不能为空")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "时间", required = true)
     private Date checkTime;
@@ -27,6 +27,8 @@ public class SignOutVo {
     @ApiModelProperty(value = "设备时间,yyyy-MM-dd HH:mm:ss")
     private Date logoutTime;
+    @ApiModelProperty(value = "签退ID")
+    private Long id;
     @Override
     public String toString() {
 package com.ruoyi.in.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ public class SignIn extends BaseEntity {
     @Excel(name = "工号")
     @ApiModelProperty("工号")
     @NotBlank(message = "工号不能为空")
+    @TableField(value = "jobCode")
     private String jobCode;
     @Excel(name = "设备号")
@@ -193,6 +193,7 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         List<DriverScheduling> dto = schedulingService.queryScheduling(signIn.getJobCode(), now);
         handleSignBody(signIn, driver, globalIndex, now, dto);
+        log.info("签到的数据为:[{}]",dto.get(globalIndex.getIndex()));
         if (PERSONNEL_POSTS_DRIVER.equals(driver.getPosts()) && Objects.equals(dto.get(globalIndex.getIndex()).getBcType(), BC_TYPE_OUT)) {
             AjaxResult result = getAjaxResultByDriverSignInfo(signIn, vo);
             if (!Objects.isNull(result)) {
@@ -201,16 +202,20 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
                 return result;
             }
         }
-
-        uploadImage(signIn, vo);
+        if(org.apache.commons.lang3.StringUtils.isNotEmpty(signIn.getImage())){
+             uploadImage(signIn, vo);
+        }
+        signIn.setSchedulingId(dto.get(globalIndex.getIndex()).getId());
         signInMapper.insertSignIn(signIn);
         // 更新考勤
         schedulingService.computedSignInBySignIn(dto, signIn, globalIndex);
-
+        vo.setId(signIn.getId());
         if (TempCache.checkJobCodeExist(signIn.getJobCode())) {
             TempCache.updateSignStatus(signIn.getJobCode());
         }
+
+
         // 异常保存到异常异常中
         threadJobService.asyncInsertExceptionRecord(signIn, driver, dto, globalIndex);
@@ -239,9 +244,9 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         if (SIGN_IN_SUCCESS.equals(signIn.getStatus())) {
             String prompt = signIn.getRemark().replace("正常", "");
             if (signIn.getType().equals(SIGN_OUT)) {
-                return AjaxResult.success(SIGN_OUT_SUCCESS_STRING + prompt, vo);
+                return AjaxResult.success(null, vo);
             } else {
-                return AjaxResult.success(SIGN_IN_SUCCESS_STRING + prompt, vo);
+                return AjaxResult.success(null, vo);
             }
         } else {
             if (signIn.getType().equals(SIGN_OUT)) {
@@ -482,7 +487,7 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
             redisCache.setCacheObject(key, ++count, 1, TimeUnit.DAYS);
         }
         if (SIGN_IN_ERROR_COUNT.compareTo(count) <= 0) {
-            return AjaxResult.success(SIGN_IN_ERROR + ": " + signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员。", vo);
+            return AjaxResult.error(SIGN_IN_ERROR + ": " + signIn.getRemark() + "酒精测试不通过" + count + "次请更换车辆驾驶员。", vo);
         }
         return null;
     }
@@ -673,8 +678,8 @@ public class SignInServiceImpl extends ServiceImpl&lt;SignInMapper, SignIn&gt; impleme
         if (BC_TYPE_OUT.equals(currentScheduling.getBcType())) {
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
             LocalDateTime subHours = time.plusHours(-1);
-            return "请在" + ConstDateUtil.formatDate("HH:mm", time) + "到"
-                    + ConstDateUtil.formatDate("HH:mm", subHours) + "之间打卡";
+            return "请在" + ConstDateUtil.formatDate("HH:mm", subHours) + "到"
+                    + ConstDateUtil.formatDate("HH:mm", time) + "之间打卡";
         } else {
             // 延后一小时
             LocalDateTime time = ConstDateUtil.stringTransformLocalDateTime(ConstDateUtil.formatDate("yyyy-MM-dd HH:mm:ss", new Date(currentScheduling.getTimestamps())), "yyyy-MM-dd HH:mm:ss");
 package com.ruoyi.pojo.response;
-import java.math.BigDecimal;
-import java.util.Date;
-import com.google.common.collect.Maps;
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.in.domain.SignIn;
 import lombok.Data;
@@ -30,6 +26,7 @@ public class SignInResponseVo extends SignIn {
      */
     String date;
+
     public SignInResponseVo(SignIn signIn){
         this.setDeviceId(signIn.getDeviceId());
         this.setId(signIn.getId());
@@ -173,7 +173,10 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     @Override
     public TipEnum updateClient(NewDriver entity) {
         NewDriver driver = new NewDriver();
-        driver.setJobCode(entity.getJobCode());
+        if(StringUtils.isNotEmpty(entity.getJobCode())) {
+            driver.setJobCode(entity.getJobCode());
+        }
+        driver.setId(entity.getId());
         NewDriver source = getOne(driver);
         if (Objects.isNull(source)) {
             log.info("[{}]找不到数据", entity);
@@ -185,7 +188,8 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
         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::getId, entity.getJobCode());
+                .set(NewDriver::getIcCardCode,entity.getIcCardCode()).set(NewDriver::getImageVersion,entity.getImageVersion())
+                .eq(NewDriver::getId, entity.getId());
         boolean flag = update(wrapper);
         return flag ? TipEnum.TIP_200 : TipEnum.TIP_500;
     }
@@ -193,7 +197,7 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     @Override
     public TipEnum faceRegister(NewDriver entity) {
         NewDriver driver = new NewDriver();
-        driver.setIdRfid(entity.getIcCardCode());
+        driver.setIcCardCode(entity.getIcCardCode());
         NewDriver source = getOne(driver);
         if (Objects.isNull(source)) {
             log.info("[{}]找不到数据", entity);
 package com.ruoyi.service.impl.dss;
-import cn.hutool.core.codec.Base64;
 import com.arcsoft.face.FaceEngine;
 import com.arcsoft.face.FaceFeature;
 import com.arcsoft.face.FaceInfo;
 import com.arcsoft.face.FaceSimilar;
 import com.arcsoft.face.enums.ErrorInfo;
+import com.arcsoft.face.toolkit.ImageFactory;
 import com.arcsoft.face.toolkit.ImageInfo;
+import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.config.BsthSystemConfig;
 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.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 import static com.arcsoft.face.toolkit.ImageFactory.getRGBData;
@@ -47,24 +53,41 @@ public class FaceServiceImpl implements FaceService {
         if (CollectionUtils.isEmpty(drivers)) {
             return null;
         }
-
-        ImageInfo sourceImage = new ImageInfo();
-
-        byte[] sourceImageData = Base64.decode(sourceDriver.getImage());
-        sourceImage.setImageData(sourceImageData);
-        FaceFeature sourceFaceFeature = generateFaceFeature(sourceDriver, sourceImage);
-        if (Objects.isNull(sourceFaceFeature)) {
+        if (StringUtils.isEmpty(sourceDriver.getImage())) {
             return null;
         }
-
-
-        Optional<NewDriver> optional = drivers.stream().map(dr -> {
-            float imageScore = checkFaceScore(dr, sourceFaceFeature);
-            dr.setImageScore(imageScore);
-
-            return dr;
-        }).max(Comparator.comparing(NewDriver::getImageScore));
-        return optional.isPresent() ? optional.get() : null;
+        ByteArrayInputStream byteArrayInputStream = null;
+        BufferedImage bufferedImage = null;
+        try {
+            String content = FileUploadUtils.choosePrictureContent(sourceDriver.getImage());
+            byte[] sourceImageData = cn.hutool.core.codec.Base64.decode(content);
+            byteArrayInputStream = new ByteArrayInputStream(sourceImageData);
+            bufferedImage = ImageIO.read(byteArrayInputStream);
+            ImageInfo sourceImage = ImageFactory.bufferedImage2ImageInfo(bufferedImage);
+
+
+            FaceFeature sourceFaceFeature = generateFaceFeature(sourceDriver, sourceImage);
+            if (Objects.isNull(sourceFaceFeature)) {
+                return null;
+            }
+
+
+            Optional<NewDriver> optional = drivers.stream().map(dr -> {
+                float imageScore = checkFaceScore(dr, sourceFaceFeature);
+                dr.setImageScore(imageScore);
+
+                return dr;
+            }).max(Comparator.comparing(NewDriver::getImageScore));
+
+            bufferedImage.flush();
+            return optional.isPresent() ? optional.get() : null;
+        } catch (IOException e) {
+            sourceDriver.setImage(null);
+            log.error("图片校验异常:[{}]", sourceDriver, e);
+        } finally {
+            IOUtils.closeQuietly(byteArrayInputStream);
+        }
+        return null;
     }
     private float checkFaceScore(NewDriver dr, FaceFeature sourceFaceFeature) {
@@ -104,14 +127,14 @@ public class FaceServiceImpl implements FaceService {
         List<FaceInfo> faceInfoList = new ArrayList<>();
         int errorCode = faceEngine.detectFaces(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList);
         if (errorCode != ErrorInfo.MOK.getValue()) {
-            log.error("人脸对比失败，请检查数据:[{}]", driver);
+            log.error("人脸对比失败，请检查数据:[{}];错误代码：[{}]", driver,errorCode);
             return null;
         }
         FaceFeature faceFeature = new FaceFeature();
         errorCode = faceEngine.extractFaceFeature(image.getImageData(), image.getWidth(), image.getHeight(), image.getImageFormat(), faceInfoList.get(0), faceFeature);
         if (errorCode != ErrorInfo.MOK.getValue()) {
-            log.error("提取对比特征失败，请检查数据:[{}]", driver);
+            log.error("提取对比特征失败，请检查数据:[{}];错误代码：[{}]", driver,errorCode);
             return null;
         }
         return faceFeature;
@@ -207,8 +207,8 @@ bsth:
         app:
             id: 8jPk3SNnaoGsd9SidMefgZXg1zbst64jB44vVyx9Cijq
         sdk:
-            # key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
-            key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
+             key: C21s5J1n1rHwXPkvVjubKshtfYuvuSe2GHus41Q1NPcT
+           # key: C21s5J1n1rHwXPkvVjubKshtofV5sHXvyUQqSWYxHp2b
         lib:
-            # path: /data/test/bath-alcoho-sign/LINUX64
-            path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
+             path: /data/test/bath-alcoho-sign/LINUX64
+           # path: D:/work/code/jienengjiancha/bsth-alcohol-sign/Bsth-admin/src/main/resources/libs/WIN64
@@ -29,7 +29,7 @@
         <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"/>
+        <result column="image_version" jdbcType="VARCHAR" property="imageVersion"/>
     </resultMap>
     <insert id="insertSelective" keyColumn="job_code" keyProperty="jobCode" useGeneratedKeys="true"
@@ -176,7 +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>
+            <if test="null!=imageVersion">image_version = #{imageVersion,jdbcType=VARCHAR},</if>
         </set>
     </sql>
@@ -208,6 +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>
+        <if test="null!=imageVersion">AND image_version = #{imageVersion,jdbcType=VARCHAR},</if>
     </sql>
 </mapper>
 \ No newline at end of file
@@ -47,6 +47,7 @@ public class FileUploadUtils {
      * 默认上传的地址
      */
     private static String defaultBaseDir = RuoYiConfig.getProfile();
+    private static String uploadContent;
     public static void setDefaultBaseDir(String defaultBaseDir) {
         FileUploadUtils.defaultBaseDir = defaultBaseDir;
@@ -128,17 +129,23 @@ public class FileUploadUtils {
      * @return ResponseResult  文件上传成功返回文件路径；上传异常返回500；文件超大返回1；不是图片返回2
      */
     public static ResponseResult<String> uploadBase64OfImage(String filePath, String fileName, String type, String uploadContent) {
+        FileUploadUtils.uploadContent = uploadContent;
         ByteArrayInputStream byteArrayInputStream = null;
         BufferedImage bufferedImage = null;
         try {
+            if (org.apache.commons.lang3.StringUtils.isEmpty(uploadContent)) {
+                return new ResponseResult<>(2, "请上传图片");
+            }
+
+            uploadContent = choosePrictureContent(uploadContent);
             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);
@@ -158,15 +165,28 @@ public class FileUploadUtils {
             boolean flag = ImageIO.write(bufferedImage, type, new File(path.toString()));
             bufferedImage.flush();
-            return flag ? ResponseResult.success(path.toString()) : new ResponseResult<>(500);
+            if (Objects.equals(Boolean.FALSE, flag)) {
+                return new ResponseResult<>(500);
+            }
+            ResponseResult<String> responseResult = ResponseResult.success();
+            responseResult.setData(path.toString());
+
+            return responseResult;
         } catch (Exception e) {
-            LOGGER.error("上传图片异常,上传的路径为:[{}]", filePath);
+            LOGGER.error("上传图片异常,上传的路径为:[{}]", filePath, e);
         } finally {
             IOUtils.closeQuietly(byteArrayInputStream);
         }
         return new ResponseResult<>(500);
     }
+    public static String choosePrictureContent(String uploadContent) {
+        if (org.apache.commons.lang3.StringUtils.indexOf(uploadContent, ";base64,")>0) {
+            uploadContent = org.apache.commons.lang3.StringUtils.substringAfter(uploadContent, ";base64,");
+        }
+        return uploadContent;
+    }
+
     /**
      * 编码文件名
      */