From 555185a9b9708839444d615907fc2d4061f4be4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Fri, 30 May 2025 18:49:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E5=AE=9E?= =?UTF-8?q?=E5=90=8D=E8=AE=A4=E8=AF=81=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/AliOssController.java | 2 +- .../system/controller/FileController.java | 12 +++------ .../common/system/entity/FileRecord.java | 4 +++ .../common/system/entity/UserVerify.java | 26 ++++++++++++++----- .../system/mapper/xml/UserVerifyMapper.xml | 22 ++++++++++++---- .../common/system/param/UserVerifyParam.java | 9 +++++-- 6 files changed, 53 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java index 6c63582..3a71031 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/AliOssController.java @@ -155,7 +155,7 @@ public class AliOssController extends BaseController { result.setLength(upload.length()); result.setPath(bucketDomain + path); result.setThumbnail(bucketDomain + path + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); - result.setUrl(bucketDomain + path + "?x-oss-process=image/resize,w_1680/quality,Q_90"); + result.setUrl(bucketDomain + path + "?x-oss-process=image/resize,w_750/quality,Q_90"); result.setDownloadUrl(bucketDomain + path); String contentType = FileServerUtil.getContentType(upload); result.setContentType(contentType); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java index 5c00c1a..490ec1d 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/FileController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/FileController.java @@ -1,11 +1,6 @@ package com.gxwebsoft.common.system.controller; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import com.aliyun.oss.OSS; -import com.aliyun.oss.OSSClientBuilder; -import com.aliyun.oss.common.auth.CredentialsProvider; -import com.aliyun.oss.common.auth.DefaultCredentialProvider; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.config.ConfigProperties; import com.gxwebsoft.common.core.utils.FileServerUtil; @@ -13,7 +8,6 @@ import com.gxwebsoft.common.core.utils.RedisUtil; import com.gxwebsoft.common.core.web.ApiResult; import com.gxwebsoft.common.core.web.BaseController; import com.gxwebsoft.common.core.web.PageResult; -import com.gxwebsoft.common.system.entity.Company; import com.gxwebsoft.common.system.entity.FileRecord; import com.gxwebsoft.common.system.param.FileRecordParam; import com.gxwebsoft.common.system.service.CompanyService; @@ -266,7 +260,8 @@ public class FileController extends BaseController { if (FileServerUtil.isImage(record.getContentType())) { record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90"); - record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90"); + record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90"); + record.setBigImage(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_2000/quality,Q_90"); } } @@ -286,7 +281,8 @@ public class FileController extends BaseController { if (FileServerUtil.isImage(record.getContentType())) { record.setThumbnail(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_100,h_100/quality,Q_90"); record.setPath(record.getPath() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90"); - record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_1680/quality,Q_90"); + record.setUrl(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_750/quality,Q_90"); + record.setBigImage(record.getDownloadUrl() + "?x-oss-process=image/resize,m_fixed,w_2000/quality,Q_90"); } } } diff --git a/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java b/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java index efb1be4..32043c9 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/FileRecord.java @@ -83,6 +83,10 @@ public class FileRecord implements Serializable { @TableField(exist = false) private String thumbnail; + @ApiModelProperty("大图(用于PC端的banner等)") + @TableField(exist = false) + private String bigImage; + @ApiModelProperty("文件下载地址") @TableField(exist = false) private String downloadUrl; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java b/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java index 14a18ed..32ed62e 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserVerify.java @@ -1,11 +1,9 @@ package com.gxwebsoft.common.system.entity; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.*; + import java.time.LocalDate; -import com.baomidou.mybatisplus.annotation.TableId; import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import java.util.Date; @@ -37,6 +35,9 @@ public class UserVerify implements Serializable { @ApiModelProperty(value = "认证类型, 0个人 1企业") private Integer type; + @ApiModelProperty(value = "主体名称") + private String name; + @ApiModelProperty(value = "真实姓名") private String realName; @@ -52,8 +53,17 @@ public class UserVerify implements Serializable { @ApiModelProperty(value = "反面") private String sfz2; - @ApiModelProperty(value = "企业名称") - private String company; + @ApiModelProperty(value = "营业执照号码") + private String zzCode; + + @ApiModelProperty(value = "营业执照照片") + private String zzImg; + + @ApiModelProperty(value = "其他证件") + private String files; + + @ApiModelProperty(value = "审核人") + private Integer adminId; @ApiModelProperty(value = "备注") private String comments; @@ -74,4 +84,8 @@ public class UserVerify implements Serializable { @ApiModelProperty(value = "修改时间") private Date updateTime; + @ApiModelProperty(value = "手机号码") + @TableField(exist = false) + private String phone; + } diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml index d094a5d..e0d1cc7 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserVerifyMapper.xml @@ -4,8 +4,9 @@ - SELECT a.* + SELECT a.*, b.phone FROM sys_user_verify a + LEFT JOIN sys_user b ON a.user_id = b.user_id AND a.id = #{param.id} @@ -16,6 +17,9 @@ AND a.type = #{param.type} + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + AND a.real_name LIKE CONCAT('%', #{param.realName}, '%') @@ -26,13 +30,13 @@ AND a.birthday LIKE CONCAT('%', #{param.birthday}, '%') - AND a.sfz_1 LIKE CONCAT('%', #{param.sfz1}, '%') + AND a.sfz1 LIKE CONCAT('%', #{param.sfz1}, '%') - AND a.sfz_2 LIKE CONCAT('%', #{param.sfz2}, '%') + AND a.sfz2 LIKE CONCAT('%', #{param.sfz2}, '%') - - AND a.company LIKE CONCAT('%', #{param.company}, '%') + + AND a.zz_code = #{param.zzCode} AND a.comments LIKE CONCAT('%', #{param.comments}, '%') @@ -52,6 +56,14 @@ AND a.create_time <= #{param.createTimeEnd} + + AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.real_name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.phone = #{param.keywords} + OR a.id_card = #{param.keywords} + OR a.zz_code = #{param.keywords} + ) + diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java index 9576985..f0ec164 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/UserVerifyParam.java @@ -34,6 +34,10 @@ public class UserVerifyParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer type; + @ApiModelProperty(value = "主体名称") + @QueryField(type = QueryType.LIKE) + private String name; + @ApiModelProperty(value = "真实姓名") private String realName; @@ -49,8 +53,9 @@ public class UserVerifyParam extends BaseParam { @ApiModelProperty(value = "反面") private String sfz2; - @ApiModelProperty(value = "企业名称") - private String company; + @ApiModelProperty(value = "营业执照号码") + @QueryField(type = QueryType.EQ) + private String zzCode; @ApiModelProperty(value = "备注") private String comments;