fix: 增加签到表描述

guzijian
1 parent 782c825a
Showing 3 changed files with 22 additions and 3 deletions
ruoyi-admin/src/main/java/com/ruoyi/in/controller/SignInController.java
ruoyi-admin/src/main/java/com/ruoyi/in/domain/SignIn.java
ruoyi-admin/src/main/java/com/ruoyi/in/service/impl/SignInServiceImpl.java
@@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.common.exception.file.FileUploadException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -85,7 +86,7 @@ public class SignInController extends BaseController
     @Log(title = "签到", businessType = BusinessType.INSERT)
     @PostMapping
     @ApiOperation("新增签到（通过后台管理页面）")
-    public AjaxResult add(@RequestBody SignIn signIn)
+    public AjaxResult add(@ApiParam @RequestBody SignIn signIn)
     {
         return toAjax(signInService.insertSignIn(signIn));
     }
@@ -98,7 +99,7 @@ public class SignInController extends BaseController
      */
     @PostMapping("/newAdd")
     @ApiOperation("新增签到（设备传入）")
-    public AjaxResult addSignIn(@RequestBody SignIn signIn) throws FileUploadException, IOException {
+    public AjaxResult addSignIn(@ApiParam @RequestBody SignIn signIn) throws FileUploadException, IOException {
         return toAjax(signInService.addSignIn(signIn));
     }
  
@@ -2,6 +2,9 @@ package com.ruoyi.in.domain;
  
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,42 +16,52 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author guzijian
  * @date 2023-07-05
  */
+@ApiModel(value = "signIn",description = "签到记录参数")
 public class SignIn extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
  
     /** 主键 */
+    @ApiModelProperty("主键")
     private Long id;
  
     /** 工号 */
     @Excel(name = "工号")
+    @ApiModelProperty("工号")
     private String jobCode;
  
     /** 设备地址 */
     @Excel(name = "设备地址")
+    @ApiModelProperty("设备ip 不用填写")
     private String ip;
  
     /** 图片 */
     @Excel(name = "图片")
+    @ApiModelProperty("图片信息")
     private String image;
     /** 签到结果 */
     @Excel(name = "签到结果")
+    @ApiModelProperty("签到结果 1 成功 2 异常")
     private Integer status;
  
     /** 签到类型 */
     @Excel(name = "签到类型")
+    @ApiModelProperty("签到类型  1 人脸 2 刷卡 3 其他 4 酒精 用可以多选 用,拼接 如 1,2,3,4")
     private String singnIn;
  
     /** 酒精测试 */
     @Excel(name = "酒精测试")
+    @ApiModelProperty("酒精测试 1 已测试 2 未测试")
     private Integer alcoholFlag;
  
     /** 签到签退 */
     @Excel(name = "签到签退")
+    @ApiModelProperty("签到签退 1 签到成功 2 签退成功")
     private Integer type;
  
     /** 酒精摄入量 */
     @Excel(name = "酒精摄入量")
+    @ApiModelProperty("酒精摄入量 52.12")
     private BigDecimal alcoholIntake;
  
     public void setId(Long id) 
@@ -5,6 +5,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Base64;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
  
@@ -16,6 +17,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.SignInEnum;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.common.utils.uuid.Seq;
 import com.ruoyi.common.utils.uuid.UUID;
 import org.apache.commons.io.FilenameUtils;
@@ -68,6 +70,7 @@ public class SignInServiceImpl implements ISignInService {
      */
     @Override
     public int insertSignIn(SignIn signIn) {
+        signIn.setIp(IpUtils.getIpAddr());
         signIn.setCreateTime(DateUtils.getNowDate());
         if (signIn.getType() == null) {
             signIn.setType(SignInEnum.SIGNIN);
@@ -112,7 +115,9 @@ public class SignInServiceImpl implements ISignInService {
     @Override
     public int addSignIn(SignIn signIn) throws FileUploadException, IOException {
         // base64转图片
-
+        System.out.println(signIn.getSingnIn());
+        signIn.setCreateTime(new Date());
+        signIn.setIp(IpUtils.getIpAddr());
         String base64 = signIn.getImage();
         // 图片路径
         String filePath = RuoYiConfig.getUploadPath();