diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FormController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FormController.java index f622c8859..1e1cc3f15 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FormController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FormController.java @@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletRequest; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.core.utils.ServletUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,7 +40,6 @@ public class FormController { /** * save表单版本+1 - * */ @Operation(summary = "save表单版本+1") @PostMapping("/saveForm") @@ -59,7 +59,7 @@ public class FormController { @PostMapping("/submit") public Boolean submitForm(@RequestBody SubmitFormRequest request, HttpServletRequest httpRequest) { // 获取客户端IP地址 - String ipAddress = getClientIpAddress(httpRequest); + String ipAddress = ServletUtils.getClientIP(); // 获取User-Agent String userAgent = httpRequest.getHeader("User-Agent"); @@ -67,6 +67,7 @@ public class FormController { dto.setProjectId(request.getProjectId()); //TODO TODO待完成 formId dto.setFormId(null); + dto.setTempletFormId(null); dto.setFormData(request.getFormData()); dto.setIpAddress(ipAddress); dto.setUserAgent(userAgent); @@ -76,10 +77,10 @@ public class FormController { /** * 根据项目ID分页查询表单提交记录 * - * @param projectId 项目ID - * @param fieldFilters 字段过滤条件 - * @param pageNum 页码 - * @param pageSize 每页大小 + * @param projectId 项目ID + * @param fieldFilters 字段过滤条件 + * @param pageNum 页码 + * @param pageSize 每页大小 * @return 表单提交记录分页数据 */ @Operation(summary = "根据项目ID分页查询表单提交记录") @@ -116,26 +117,6 @@ public class FormController { return formService.listFormDataByProjectId(projectId); } - /** - * 获取客户端IP地址 - * - * @param request HttpServletRequest对象 - * @return 客户端IP地址 - */ - private String getClientIpAddress(HttpServletRequest request) { - String ipAddress = request.getHeader("X-Forwarded-For"); - if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) { - ipAddress = request.getHeader("Proxy-Client-IP"); - } - if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) { - ipAddress = request.getHeader("WL-Proxy-Client-IP"); - } - if (ipAddress == null || ipAddress.isEmpty() || "unknown".equalsIgnoreCase(ipAddress)) { - ipAddress = request.getRemoteAddr(); - } - return ipAddress; - } - @Getter @Setter public static class SubmitFormRequest { diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java index 3a3a44dab..427430e9e 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java @@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.satoken.utils.LoginHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -85,7 +86,7 @@ public class H5ProjectController { h5Project.setPreviewWidth(request.getPreviewWidth()); h5Project.setPreviewHeight(request.getPreviewHeight()); h5Project.setStatus(request.getStatus()); - + h5Project.setCreatedBy(LoginHelper.getUserId()); boolean success = h5ProjectService.saveH5ProjectWithContent(h5Project, request.getContent(), request.getGroupIds()); if (success) { return h5Project.getId(); diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java index 647abfcd6..0ac612d17 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java @@ -78,4 +78,7 @@ public class FormSubmission implements Serializable { */ @TableField("update_time") private LocalDateTime updateTime; -} \ No newline at end of file + + private Long createdBy; + +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java index b802170ae..3790f6b83 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java @@ -91,4 +91,6 @@ public class H5Project implements Serializable { */ private LocalDateTime updateTime; + private Long createdBy; + }