fix: 人脸注册更新

guzijian
1 parent 75bf6eaa
Showing 7 changed files with 194 additions and 1 deletions
ruoyi-admin/src/main/java/com/ruoyi/common/global/Result.java
ruoyi-admin/src/main/java/com/ruoyi/common/global/ResultCode.java
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
ruoyi-admin/src/main/java/com/ruoyi/pojo/request/DriverSignInRequestVo.java
+package com.ruoyi.common.global;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import static com.ruoyi.common.global.ResultCode.CODE_200;
+import static com.ruoyi.common.global.ResultCode.CODE_500;
+
+
+/**
+ * 返回结果
+ * @author 20412
+ */
+@Data
+@ApiModel("返回结果")
+public class Result<T extends Object> {
+
+    @ApiModelProperty(value = "是否成功")
+    private Boolean success;
+
+    @ApiModelProperty(value = "状态码")
+    private Integer code;
+
+    @ApiModelProperty(value = "返回消息")
+    private String msg;
+
+    @ApiModelProperty(value = "返回对象")
+    private T data ;
+
+    private Result() {}
+
+    /** 成功静态方法 */
+    public static Result OK() {
+        Result r = new Result();
+        r.setSuccess(true);
+        r.setCode(CODE_200.getCode());
+        r.setMsg("成功");
+        return r;
+    }
+
+    /** 成功静态方法 */
+    public static <T> Result<T> OK(T data) {
+        Result r = new Result();
+        r.setSuccess(true);
+        r.setCode(CODE_200.getCode());
+        r.setData(data);
+        r.setMsg("成功");
+        return r;
+    }
+
+    /** 成功静态方法 */
+    public static <T> Result<T> OK(T data, String message) {
+        Result r = new Result();
+        r.setSuccess(true);
+        r.setCode(CODE_200.getCode());
+        r.setData(data);
+        r.setMsg(message);
+        return r;
+    }
+
+    /** 失败静态方法 */
+    public static Result ERROR() {
+        Result r = new Result();
+        r.setSuccess(false);
+        r.setCode(CODE_500.getCode());
+        r.setMsg("失败");
+        return r;
+    }
+
+    /** 失败静态方法 */
+    public static Result ERROR(String message) {
+        Result r = new Result();
+        r.setSuccess(false);
+        r.setCode(CODE_500.getCode());
+        r.setMsg(message);
+        return r;
+    }
+
+    /** 设置状态码 */
+    public Result code(Integer code){
+        this.setCode(code);
+        return this;
+    }
+
+    /** 设置集合 */
+    public Result<T> data(T map){
+        this.setData(map);
+        return this;
+    }
+}
+package com.ruoyi.common.global;
+
+public enum ResultCode {
+
+    /*
+     * 错误信息
+     * */
+    CODE_200(200, "操作成功"),
+    CODE_201(201,"对象创建成功"),
+    CODE_202(202,"请求已经被接受"),
+    CODE_400(400,"参数列表错误（缺少，格式不匹配）"),
+    CODE_401(401,"未授权"),
+    CODE_403(403,"访问受限，授权过期"),
+    CODE_404(404,"资源，服务未找到"),
+    CODE_500(500,"操作失败"),
+    ;
+
+    private Integer Code;
+    private String Msg;
+    ResultCode(Integer Code, String Msg) {
+        this.Code = Code;
+        this.Msg = Msg;
+    }
+    public Integer getCode() {
+        return Code;
+    }
+    public String getMsg() {
+        return Msg;
+    }
+}
 \ No newline at end of file
@@ -4,6 +4,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.global.Result;
+import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceRegistrationFeedbackVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import io.swagger.annotations.Api;
@@ -113,6 +115,19 @@ public class DriverController extends BaseController {
     }
+    /**
+     * 新增驾驶员信息
+     */
+//    @PreAuthorize("@ss.hasPermi('driver:driver:add')")
+//    @Log(title = "驾驶员信息", businessType = BusinessType.INSERT)
+    @PostMapping("/driver/sign")
+    @ApiOperation("新增驾驶员信息（设备传入）")
+    public Result<?> addNewDriver(@ApiParam @RequestBody @Validated DriverSignInRequestVo vo) {
+        driverService.saveDriverSignInfo(vo);
+        return Result.OK();
+    }
+
+
     /**
      * 修改驾驶员信息
@@ -163,6 +178,7 @@ public class DriverController extends BaseController {
         return driverService.checkJobCode(driver);
     }
+
     @PostMapping("/upload")
     @ApiOperation("驾驶员人脸上传接口")
     public AjaxResult uploadImage(MultipartFile file) {
@@ -6,6 +6,7 @@ import java.util.List;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.file.InvalidExtensionException;
 import com.ruoyi.driver.domain.Driver;
+import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import org.springframework.web.multipart.MultipartFile;
@@ -95,4 +96,6 @@ public interface IDriverService
     void updateDriverByComputed();
     void updateFaceByJob(HttpServletRequest request, FaceUpdateReqVo vo);
+
+    void saveDriverSignInfo(DriverSignInRequestVo vo);
 }
@@ -17,8 +17,10 @@ import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
 import com.ruoyi.equipment.mapper.EquipmentMapper;
 import com.ruoyi.framework.config.ServerConfig;
+import com.ruoyi.in.domain.SignIn;
 import com.ruoyi.job.DriverJob;
 import com.ruoyi.pojo.domain.EquipmentDriverExpand;
+import com.ruoyi.pojo.request.DriverSignInRequestVo;
 import com.ruoyi.pojo.request.FaceUpdateReqVo;
 import com.ruoyi.pojo.response.ResponseScheduling;
 import com.ruoyi.service.ThreadJobService;
@@ -42,6 +44,7 @@ import javax.servlet.http.HttpServletResponse;
 import static com.ruoyi.common.ApiProperties.PERSONNEL_API_KEY;
 import static com.ruoyi.common.redispre.GlobalRedisPreName.DRIVER_SCHEDULING_PRE;
+import static com.ruoyi.in.service.impl.SignInServiceImpl.checkImageBase64Format;
 /**
  * 驾驶员信息Service业务层处理
@@ -312,6 +315,29 @@ public class DriverServiceImpl implements IDriverService {
         log.info("删除注册表中对应工号的数据结束");
     }
+    @Override
+    public void saveDriverSignInfo(DriverSignInRequestVo vo) {
+        Driver driver = new Driver();
+        driver.setJobCode(vo.getJobCode());
+        driver.setPersonnelName(vo.getName());
+        driver.setPosts(vo.getPosts());
+        String base64 = vo.getImage();
+        String fileName = vo.getJobCode() + ".png";
+        String filePath = new File(RuoYiConfig.getUploadPath() + headImagePre + "/" + fileName + File.separator).getAbsolutePath();
+        try {
+            fileName = FileUploadUtils.getPathFileName(RuoYiConfig.getUploadPath() + headImagePre, fileName);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        driver.setImage(fileName);
+        driver.setUpdateTime(new Date());
+        int result = driverMapper.insertDriver(driver);
+        if (result == 0) driverMapper.updateDriversByJobCodes(new ArrayList<>(Arrays.asList(driver)));
+        log.info("开始上传签到图片");
+        // 异步上传文件
+        threadJobService.asyncStartUploadBase64Image(filePath, base64);
+    }
+
     /**
      * 获取新的imageUrl
      *
@@ -243,7 +243,7 @@ public class SignInServiceImpl implements ISignInService {
         // 酒精测试校验 确定 且员工工种是驾驶员
         if (ALCOHOL_FLAG_YES.equals(signIn.getAlcoholFlag()) && PERSONNEL_POSTS_DRIVER.equals(driver.getPosts())) {
             if (new BigDecimal(20).compareTo(signIn.getAlcoholIntake()) <= 0) {
-                signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR);
+                signIn.setRemark(signIn.getRemark() + ALCOHOL_SIGN_IN_ERROR + "," + signIn.getAlcoholIntake().toString() +"mg/100ml");
                 result = false;
             }
         }
+package com.ruoyi.pojo.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ *
+ * @author 20412
+ */
+@Data
+@ApiModel("注册对象")
+public class DriverSignInRequestVo {
+    @NotBlank
+    @ApiModelProperty("工号")
+    String jobCode;
+    @NotBlank
+    @ApiModelProperty("姓名")
+    String name;
+    @NotBlank
+    @ApiModelProperty("工种")
+    String posts;
+    @ApiModelProperty("图片")
+    String image;
+}