签名模块调整

src/main/java/com/xjrsoft/module/organization/controller/UserController.java

@@ -39,6 +39,7 @@ import com.xjrsoft.module.organization.dto.ResetPasswordDto;
 import com.xjrsoft.module.organization.dto.UpdateInfoDto;
 import com.xjrsoft.module.organization.dto.UpdatePasswordDto;
 import com.xjrsoft.module.organization.dto.UpdateUserDto;
+import com.xjrsoft.module.organization.dto.UploadSignDto;
 import com.xjrsoft.module.organization.dto.UserPageDto;
 import com.xjrsoft.module.organization.dto.UserStudentAddDto;
 import com.xjrsoft.module.organization.dto.UserStudentBindDto;
@@ -333,6 +334,10 @@ public class UserController {
             vo.setClassName(userStudentVo.getClassName());
         }
 
+        List<File> fileList = fileService.list(Wrappers.lambdaQuery(File.class).eq(File::getFolderId, user.getSignFolderId()));
+        if(!list.isEmpty()){
+            vo.setSignUrl(fileList.get(0).getFileUrl());
+        }
         return R.ok(vo);
     }
 
@@ -638,10 +643,12 @@ public class UserController {
 
     @PostMapping("/upload-sign")
     @ApiOperation(value = "上传签名")
-    public RT<Boolean> uploadSign(@Valid @RequestParam Long folderId) {
+    public RT<Boolean> uploadSign(@Valid @RequestBody UploadSignDto dto) {
         long loginIdAsLong = StpUtil.getLoginIdAsLong();
         User user = userService.getById(loginIdAsLong);
-        user.setSignFolderId(folderId);
+        user.setSignFolderId(dto.getFolderId());
+        user.setSignPassword(BCrypt.hashpw(dto.getSignPassword(), BCrypt.gensalt()));
+
         return RT.ok(userService.updateById(user));
     }
 

src/main/java/com/xjrsoft/module/organization/dto/UploadSignDto.java

@@ -0,0 +1,9 @@
+package com.xjrsoft.module.organization.dto;
+
+import lombok.Data;
+
+@Data
+public class UploadSignDto {
+    private Long folderId;
+    private String signPassword;
+}

src/main/java/com/xjrsoft/module/organization/entity/User.java

@@ -105,4 +105,7 @@ public class User extends AuditEntity implements Serializable {
 
     @ApiModelProperty("签名文件")
     private Long signFolderId;
+
+    @ApiModelProperty("签名密码")
+    private String signPassword;
 }

src/main/java/com/xjrsoft/module/organization/vo/UserInfoVo.java

@@ -1,5 +1,6 @@
 package com.xjrsoft.module.organization.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -118,4 +119,10 @@ public class UserInfoVo {
      * 家长绑定的学生
      */
     private List<UserStudentVo> students;
+
+    @ApiModelProperty("签名地址")
+    private String signUrl;
+
+    @ApiModelProperty("签名文件id")
+    private Long signFolderId;
 }

src/main/java/com/xjrsoft/module/student/entity/BaseStudentUser.java

@@ -198,4 +198,7 @@ public class BaseStudentUser implements Serializable {
 
     @ApiModelProperty("签名文件")
     private Long signFolderId;
+
+    @ApiModelProperty("签名密码")
+    private String signPassword;
 }

src/main/java/com/xjrsoft/module/teacher/entity/XjrUser.java

@@ -210,4 +210,7 @@ public class XjrUser implements Serializable {
 
     @ApiModelProperty("签名文件")
     private Long signFolderId;
+
+    @ApiModelProperty("签名密码")
+    private String signPassword;
 }