档案管理系统

eladmin-common/pom.xml

@@ -22,5 +22,10 @@
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
+        <dependency>
+        	<groupId>org.springframework.boot</groupId>
+        	<artifactId>spring-boot-configuration-processor</artifactId>
+        	<optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

eladmin-common/src/main/java/me/zhengjie/base/ResponseDTO.java

@@ -0,0 +1,103 @@
+package me.zhengjie.base;
+
+/**
+ * 返回类
+ *
+ * @param <T>
+ * @author zhuoda
+ */
+public class ResponseDTO<T> {
+
+	protected Integer code;
+
+	protected String msg;
+	protected T data;
+
+	public ResponseDTO() {
+	}
+
+	public ResponseDTO(Integer code, String msg) {
+		this.code = code;
+		this.msg = msg;
+
+	}
+
+	public ResponseDTO(Integer code, T t) {
+		this.code = code;
+		this.data = t;
+
+	}
+
+	public ResponseDTO(ResultCode result, boolean bool) {
+		this.code = result.code();
+		this.msg = result.message();
+	}
+
+	public ResponseDTO(ResultCode result, String msg) {
+		this.code = result.code();
+		this.msg = msg;
+	}
+
+	public ResponseDTO(ResultCode result, T data, boolean bool) {
+		this.code = result.code();
+		this.msg = result.message();
+		this.data = data;
+	}
+
+	public ResponseDTO(ResponseDTO<T> responseDTO) {
+		this.code = responseDTO.getCode();
+		this.msg = responseDTO.getMsg();
+	}
+
+	public static <T> ResponseDTO<T> success() {
+		return new ResponseDTO<>(ResultCode.SUCCESS, true);
+	}
+
+	public static <T> ResponseDTO<T> success(T data) {
+		return new ResponseDTO<>(ResultCode.SUCCESS, data, true);
+	}
+
+	public static <T> ResponseDTO<T> error(ResultCode result) {
+
+		return new ResponseDTO<>(result, false);
+	}
+
+	public static <T> ResponseDTO<T> error(ResultCode result, String msg) {
+
+		return new ResponseDTO<>(result, msg);
+	}
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public ResponseDTO<T> setMsg(String msg) {
+		this.msg = msg;
+		return this;
+	}
+
+	public int getCode() {
+		return code;
+	}
+
+	public ResponseDTO<T> setCode(Integer code) {
+		this.code = code;
+		return this;
+	}
+
+	public T getData() {
+		return data;
+	}
+
+	public ResponseDTO<T> setData(T data) {
+		this.data = data;
+		return this;
+	}
+
+	@Override
+	public String toString() {
+		return "ResponseDTO{" + "code=" + code + ", msg='" + msg + '\'' + ",  data=" + data
+				+ '}';
+	}
+
+}

eladmin-common/src/main/java/me/zhengjie/base/ResultCode.java

@@ -0,0 +1,186 @@
+package me.zhengjie.base;
+
+
+
+/**
+ * ========================
+ * 通用响应状态
+ * ========================
+ */
+public enum ResultCode {
+	 //这里是框架以前的
+	 REQUEST_METHOD_ERROR(114, "请求方式错误"),
+	 ERROR_PARAM (101, "参数异常！"),
+     ERROR_PARAM_ANY (102, "%s参数异常！"),
+     SYSTEM_ERROR  (111, "系统错误"),
+     DEVELOPMENT (112, "此功能正在开发中"),
+     NOT_EXISTS (113, "数据不存在"),
+     JSON_FORMAT_ERROR(115, "JSON格式错误"),
+    /* 成功状态码 */
+    SUCCESS(100,"操作成功！"),
+
+    /* 错误状态码 */
+    FAIL(-1,"操作失败！"),
+
+    /* 参数错误：10001-19999 */
+    PARAM_IS_INVALID(10001, "参数无效"),
+    PARAM_IS_BLANK(10002, "参数为空"),
+    PARAM_TYPE_BIND_ERROR(10003, "参数格式错误"),
+    PARAM_NOT_COMPLETE(10004, "参数缺失"),
+
+    /* 用户错误：20001-29999*/
+    USER_NOT_LOGGED_IN(20001, "用户未登录，请先登录"),
+    USER_LOGIN_ERROR(20002, "账号不存在或密码错误"),
+    USER_ACCOUNT_FORBIDDEN(20003, "账号已被禁用"),
+    USER_NOT_EXIST(20004, "用户不存在"),
+    USER_HAS_EXISTED(20005, "用户已存在"),
+    AUTHCODE_EXPIRATION(20006, "验证码已过期，请重试！"),
+    AUTHCODE_ERROR(20007, "验证码错误，请重试！"),
+    USER_LOGIN_PAST_DUE(20008, "登录信息已失效，请重新登陆！"),
+    LOGIN_HAS_EXISTED(20009, "该账号已登陆，请勿重复登陆！"),
+    PHONE_HAS_EXISTED(20010, "手机号码已存在！"),
+    NAME_IDCARD_UNMATCHED(20011,"姓名与身份证号不匹配"),
+
+
+    /* 业务错误：30001-39999 */
+    BUSINESS_GROUP_NO_ALLOWED_DEL(30001, "应用分组已经被应用使用，不能删除"),
+    BUSINESS_THEME_NO_ALLOWED_DEL(30002, "主题已经被用户使用，不能删除"),
+    BUSINESS_THEME_NO_ALLOWED_DISABLE(30003, "主题已经被用户使用，不能停用"),
+    BUSINESS_THEME_DEFAULT_NO_ALLOWED_DEL(30004, "默认主题，不能删除"),
+    BUSINESS_THEME_NO_ALLOWED_UPDATE(30005, "主题已经被用户使用，不能修改图片信息"),
+    BUSINESS_IMAGE_UPLOAD_ERROR(30005, "图片上传失败！"),
+    BUSINESS_PROCESS_ERROR(30006, "非法的流程合同流程！"),
+    
+    
+    BUSINESS_IS_TOP(30040, "已经到最顶部"),
+    BUSINESS_IS_BOTTOM(30041, "已经到最底部"),
+    BUSINESS_NAME_EXISTED(30051, "名称已存在"),
+    NOTARY_OFFLINE(30005, "当前公证员离线，请稍后再试！"),
+    LIVING_CERTIFICATION(30006, "请先进行活体认证"),
+    SEAT_BUSY(30007, "当前坐席忙，请稍后再试！"),
+    FACEAUTH_FAIL(30008, "活体人脸认证失败，请重试！"),
+    SIGN_FAIL(30009, "签名失败，请重试！"),
+    CREATEPDF_FAIL(30010, "PDF生成失败！"),
+    FILE_NOTFOUND_FAIL(30011, "您查看的文件未找到"),
+    SAVE_PAYINFO_FAIL(30012, "支付信息入库失败"),
+    MAIN_REJECT_FAIL(30013, "当前主工单已被驳回"),
+    RECORD_PASS_EXIST(30014, "该工单已审核通过，请勿重复操作"),
+    RECORD_REJECT_EXIST(30015, "该工单已被驳回，请勿重复操作"),
+    NOTARY_NOTE_EXIST(30016, "您已提交过笔录信息，请勿重复操作"),
+    NOTARY_NOT_PASS(30017, "工单尚未审批通过，请勿上传公证书！"),
+    ORDER_DATA_NOT_EXIST(30018, "不存在该订单！"),
+    CERTIFICATE_NO_ERROR(30019, "获取用户证书编号发生错误！"),
+    
+    LIVE_VIDEO_INVALID(30020, "活体人脸核身失败！"),
+    LIVE_VIDEO_CONVERSION(30022, "活体视频转换失败！"),
+    SIMILARITY_IS_LT_40_PERCENT (30023, "相似度低于40%，请重试！"),
+    SIGN_UPLOAD_FAIL(30024, "签字图片上传失败！"),
+    ACCOUNT_MANAGER_NO_ASSIGNED(30025, "未分配客户经理！"),
+    
+    WEBSOCKET_SEND_MSG_ERROR(30026, "websocket发送消息失败！"),
+
+    FILE_DOES_NOT_EXIST(30027, "文件不存在！"),
+    
+    MSG_SEND_FREQUENT(30028, "短信发送太频繁！"),
+    MSG_SEND_FAIL(30029, "短信发送失败！"),
+    
+    FILE_UPLOAD_FAIL(30030, "文件上传失败！"),
+
+    AXQ_USER_REGIST_FAIL(30031,"安心签注册失败"),
+    AXQ_AUTH_MESSAGE_FAIL(30032,"授权信息发送失败"),
+    AXQ_AUTH_FAIL(30033,"签名授权失败"),
+    HANDWRITING_FAIL(30034,"签名与本人姓名不一致"),
+    AXQ_PROJECT_AUTHED(30035,"项目已经授权"),
+    AXQ_PROJECT_UNAUTHED(30036,"项目未授权"),
+    UNFINISHED_ORDER_FAIL(30037,"尚有未完成订单"),
+    HAS_BEEN_MAPPED_FAIL(30038,"提交银行已有关联的公证处，请核对信息是否正确！"),
+    SUB_ORDER_UNCOMPLETED(30039,"子订单信息尚未提交完整！"),
+    INTERVIEW_NOTE_UNSUBMIT(30040, "面谈笔录尚未完成！"),
+    UPLOAD_SEAL_FAIL(30041, "上传签章失败"),
+    QUERY_CERTIFICATE_FAIL(30042,"查询证书失败！"),
+    REMAIN_BANK_USER(30043, "银行下尚有用户未删除！"),
+    REMAIN_NOTARY_USER(30044, "公证处尚有用户未删除！"),
+    REMAIN_NOTARY_OFFICE_MAPPING(30045,"银行尚有关联的公证处未取消！"),
+    REMAIN_USER_BANK_MAPPING(30046,"公证处尚有关联的银行未取消！"),
+    MODEL_ALREADY_EXISGT(30047,"%s,该类模板已经创建！"),
+    MODEL_SORT_EXISTED(30048,"模板排序值重复！"),
+    NO_NOTARIZARION_NO(30049,"没有可用的公证书编号！"),
+    SUCC_ALREADY_EXISTED(30050,"社会统一信用代码已存在，请确认输入是否正确！"),
+    SUCC_NEED_INPUT(30051,"请输入社会统一信用代码！"),
+    ORDER_OCR_SERVICE_UNAVAILABLE(30052,"订单扫描录入功能尚未开通，请联系平台开通后使用！"),
+    JOB_NO_ALREADY_EXISTS(30053,"此工号已存在，请重新输入！"),
+    NOTARY_OFFICE_CODE_ALREADY_EXISTS(30054,"公证处编码已存在！"),
+    /* 系统错误：40001-49999 */
+    SYSTEM_INNER_ERROR(40001, "系统繁忙，请稍后重试"),
+    UPLOAD_ERROR(40002, "系统异常，上传文件失败"),
+    FILE_MAX_SIZE_OVERFLOW(40003, "上传尺寸过大"),
+    FILE_ACCEPT_NOT_SUPPORT(40004, "上传文件格式不支持"),
+    SET_UP_AT_LEAST_ONE_ADMIN(40005, "至少指定一个管理员"),
+    URL_INVALID(40006, "地址不合法"),
+    FILE_EXISTING(40017,"上传的文件已存在"),
+    LINK_AND_LOGOUT_NO_MATCH(40006, "主页地址和注销地址IP不一致"),
+    IP_AND_PORT_EXISTED(40007, "当前IP和端口已经被占中"),
+    LINK_IS_REQUIRED(40008, "生成第三方token认证信息： 主页地址不能为空,请完善信息"),
+    ONLY_ROOT_DEPARTMENT(40009, "组织机构只能存在一个根机构"),
+    DEPART_CODE_EXISTED(40010, "组织机构编码已存在"),
+    DEPART_CONTAINS_USERS(40011, "该机构下是存在用户，不允许删除"),
+    DEPART_CONTAINS_SON(40012, "该机构下是存在子级机构，不允许删除"),
+    DEPART_PARENT_IS_SELF(40013, "选择的父机构不能为本身"),
+    DICT_EXIST_DEPEND(40014, "该字典数据存在详情依赖，不允许删除"),
+    DICT_DETAIL_LOCK(40015, "该字典数据被锁定，不允许修改或删除"),
+    DEPART_CODE_EXISTED_WITH_ARGS(40016, "组织机构编码【{0}】系统已存在"),
+    IMAGE_NOT_STANDARD(40017,"请保持人脸居中"),
+    SINGLE_PERSON(40018,"镜头内只能有1人"),
+    /* 数据错误：50001-599999 */
+    RESULT_DATA_NONE(50001, "数据未找到"),
+    DATA_IS_WRONG(50002, "数据有误"),
+    DATA_ALREADY_EXISTED(50003, "数据已存在"),
+    DATA_INSERT_ERROR(50003,"数据插入失败"),
+    DATA_UPDATE_ERROR(50004,"数据编辑失败"),
+
+    /* 接口错误：60001-69999 */
+    INTERFACE_INNER_INVOKE_ERROR(60001, "内部系统接口调用异常"),
+    INTERFACE_OUTTER_INVOKE_ERROR(60002, "外部系统接口调用异常"),
+    INTERFACE_FORBID_VISIT(60003, "该接口禁止访问"),
+    INTERFACE_ADDRESS_INVALID(60004, "接口地址无效"),
+    INTERFACE_REQUEST_TIMEOUT(60005, "接口请求超时"),
+    INTERFACE_EXCEED_LOAD(60006, "接口负载过高"),
+    INTERFACE_ILLEGAL_REQUEST(60007, "非法的请求"),
+    INTERFACE_SMS_TEMPLATE(60008, "模板请求错误"),
+    /* 权限错误：70001-79999 */
+    PERMISSION_UNAUTHENTICATED(70001,"此操作需要登陆系统！"),
+    PERMISSION_UNAUTHORISE(70002,"权限不足，无权操作！"),
+    PERMISSION_EXPIRE(70003,"登录状态过期！"),
+    PERMISSION_TOKEN_EXPIRED(70004, "token已过期"),
+    PERMISSION_LIMIT(70005, "访问次数受限制"),
+    PERMISSION_TOKEN_INVALID(70006, "无效token"),
+    PERMISSION_SIGNATURE_ERROR(70007, "签名失败"),
+    
+    TOKEN_ILLEGAL(7008,"违法Authorization，服务端不存在信息，请重新鉴权获取！"),
+    ;
+ 
+    //操作代码
+    int code;
+    //提示信息
+    String message;
+    ResultCode(int code, String message){
+        this.code = code;
+        this.message = message;
+    }
+
+    public int code() {
+        return code;
+    }
+
+    public String message() {
+        return message;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}

eladmin-common/src/main/java/me/zhengjie/utils/BeanCopyUtils.java

@@ -0,0 +1,47 @@
+package me.zhengjie.utils;
+
+
+import java.util.List;
+
+import org.apache.commons.collections4.CollectionUtils;
+
+
+import com.google.common.collect.Lists;
+
+
+import cn.hutool.core.bean.BeanUtil;
+
+
+public class BeanCopyUtils {
+	/**
+	 * @param input 输入集合
+	 * @param clzz  输出集合类型
+	 * @param <E>   输入集合类型
+	 * @param <T>   输出集合类型
+	 * @return 返回集合
+	 */
+	public static <E, T> List<T> convertList2List(List<E> input, Class<T> tClass, String... ignoreProperties) {
+		List<T> output = Lists.newArrayList();
+		if (CollectionUtils.isNotEmpty(input)) {
+			for (E source : input) {
+				T target = BeanUtil.copyProperties(source, tClass);
+				output.add(target);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * @param input 输入集合
+	 * @param clzz  输出集合类型
+	 * @param <E>   输入集合类型
+	 * @param <T>   输出集合类型
+	 * @return 返回集合
+	 */
+	public static <E, T> T convertObj(Object input, Class<T> targetClass, String... ignoreProperties) {
+
+		return BeanUtil.copyProperties(input, targetClass);
+
+	}
+
+}

eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java

@@ -32,6 +32,7 @@ import java.io.*;
 import java.security.MessageDigest;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -44,313 +45,381 @@ import java.util.Map;
  */
 public class FileUtil extends cn.hutool.core.io.FileUtil {
 
-    private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
+	private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
 
-    /**
-     * 系统临时目录
-     * <br>
-     * windows 包含路径分割符，但Linux 不包含,
-     * 在windows \\==\ 前提下，
-     * 为安全起见 同意拼装 路径分割符，
-     * <pre>
-     *       java.io.tmpdir
-     *       windows : C:\Users/xxx\AppData\Local\Temp\
-     *       linux: /temp
-     * </pre>
-     */
-    public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator;
-    /**
-     * 定义GB的计算常量
-     */
-    private static final int GB = 1024 * 1024 * 1024;
-    /**
-     * 定义MB的计算常量
-     */
-    private static final int MB = 1024 * 1024;
-    /**
-     * 定义KB的计算常量
-     */
-    private static final int KB = 1024;
+	/**
+	 * 系统临时目录 <br>
+	 * windows 包含路径分割符，但Linux 不包含, 在windows \\==\ 前提下， 为安全起见 同意拼装 路径分割符，
+	 * 
+	 * <pre>
+	 *       java.io.tmpdir
+	 *       windows : C:\Users/xxx\AppData\Local\Temp\
+	 *       linux: /temp
+	 * </pre>
+	 */
+	public static final String SYS_TEM_DIR = System.getProperty("java.io.tmpdir") + File.separator;
+	/**
+	 * 定义GB的计算常量
+	 */
+	private static final int GB = 1024 * 1024 * 1024;
+	/**
+	 * 定义MB的计算常量
+	 */
+	private static final int MB = 1024 * 1024;
+	/**
+	 * 定义KB的计算常量
+	 */
+	private static final int KB = 1024;
 
-    /**
-     * 格式化小数
-     */
-    private static final DecimalFormat DF = new DecimalFormat("0.00");
+	/**
+	 * 格式化小数
+	 */
+	private static final DecimalFormat DF = new DecimalFormat("0.00");
 
-    public static final String IMAGE = "图片";
-    public static final String TXT = "文档";
-    public static final String MUSIC = "音乐";
-    public static final String VIDEO = "视频";
-    public static final String OTHER = "其他";
+	public static final String IMAGE = "图片";
+	public static final String TXT = "文档";
+	public static final String MUSIC = "音乐";
+	public static final String VIDEO = "视频";
+	public static final String OTHER = "其他";
 
+	/**
+	 * MultipartFile转File
+	 */
+	public static File toFile(MultipartFile multipartFile) {
+		// 获取文件名
+		String fileName = multipartFile.getOriginalFilename();
+		// 获取文件后缀
+		String prefix = "." + getExtensionName(fileName);
+		File file = null;
+		try {
+			// 用uuid作为文件名，防止生成的临时文件重复
+			file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
+			// MultipartFile to File
+			multipartFile.transferTo(file);
+		} catch (IOException e) {
+			log.error(e.getMessage(), e);
+		}
+		return file;
+	}
 
-    /**
-     * MultipartFile转File
-     */
-    public static File toFile(MultipartFile multipartFile) {
-        // 获取文件名
-        String fileName = multipartFile.getOriginalFilename();
-        // 获取文件后缀
-        String prefix = "." + getExtensionName(fileName);
-        File file = null;
-        try {
-            // 用uuid作为文件名，防止生成的临时文件重复
-            file = new File(SYS_TEM_DIR + IdUtil.simpleUUID() + prefix);
-            // MultipartFile to File
-            multipartFile.transferTo(file);
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return file;
-    }
+	/**
+	 * 获取文件扩展名，不带 .
+	 */
+	public static String getExtensionName(String filename) {
+		if ((filename != null) && (filename.length() > 0)) {
+			int dot = filename.lastIndexOf('.');
+			if ((dot > -1) && (dot < (filename.length() - 1))) {
+				return filename.substring(dot + 1);
+			}
+		}
+		return filename;
+	}
 
-    /**
-     * 获取文件扩展名，不带 .
-     */
-    public static String getExtensionName(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
-            int dot = filename.lastIndexOf('.');
-            if ((dot > -1) && (dot < (filename.length() - 1))) {
-                return filename.substring(dot + 1);
-            }
-        }
-        return filename;
-    }
+	/**
+	 * Java文件操作 获取不带扩展名的文件名
+	 */
+	public static String getFileNameNoEx(String filename) {
+		if ((filename != null) && (filename.length() > 0)) {
+			int dot = filename.lastIndexOf('.');
+			if ((dot > -1) && (dot < (filename.length()))) {
+				return filename.substring(0, dot);
+			}
+		}
+		return filename;
+	}
 
-    /**
-     * Java文件操作 获取不带扩展名的文件名
-     */
-    public static String getFileNameNoEx(String filename) {
-        if ((filename != null) && (filename.length() > 0)) {
-            int dot = filename.lastIndexOf('.');
-            if ((dot > -1) && (dot < (filename.length()))) {
-                return filename.substring(0, dot);
-            }
-        }
-        return filename;
-    }
+	/**
+	 * 文件大小转换
+	 */
+	public static String getSize(long size) {
+		String resultSize;
+		if (size / GB >= 1) {
+			// 如果当前Byte的值大于等于1GB
+			resultSize = DF.format(size / (float) GB) + "GB   ";
+		} else if (size / MB >= 1) {
+			// 如果当前Byte的值大于等于1MB
+			resultSize = DF.format(size / (float) MB) + "MB   ";
+		} else if (size / KB >= 1) {
+			// 如果当前Byte的值大于等于1KB
+			resultSize = DF.format(size / (float) KB) + "KB   ";
+		} else {
+			resultSize = size + "B   ";
+		}
+		return resultSize;
+	}
 
-    /**
-     * 文件大小转换
-     */
-    public static String getSize(long size) {
-        String resultSize;
-        if (size / GB >= 1) {
-            //如果当前Byte的值大于等于1GB
-            resultSize = DF.format(size / (float) GB) + "GB   ";
-        } else if (size / MB >= 1) {
-            //如果当前Byte的值大于等于1MB
-            resultSize = DF.format(size / (float) MB) + "MB   ";
-        } else if (size / KB >= 1) {
-            //如果当前Byte的值大于等于1KB
-            resultSize = DF.format(size / (float) KB) + "KB   ";
-        } else {
-            resultSize = size + "B   ";
-        }
-        return resultSize;
-    }
+	/**
+	 * inputStream 转 File
+	 */
+	static File inputStreamToFile(InputStream ins, String name) {
+		File file = new File(SYS_TEM_DIR + name);
+		if (file.exists()) {
+			return file;
+		}
+		OutputStream os = null;
+		try {
+			os = new FileOutputStream(file);
+			int bytesRead;
+			int len = 8192;
+			byte[] buffer = new byte[len];
+			while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
+				os.write(buffer, 0, bytesRead);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		} finally {
+			CloseUtil.close(os);
+			CloseUtil.close(ins);
+		}
+		return file;
+	}
 
-    /**
-     * inputStream 转 File
-     */
-    static File inputStreamToFile(InputStream ins, String name){
-        File file = new File(SYS_TEM_DIR + name);
-        if (file.exists()) {
-            return file;
-        }
-        OutputStream os = null;
-        try {
-            os = new FileOutputStream(file);
-            int bytesRead;
-            int len = 8192;
-            byte[] buffer = new byte[len];
-            while ((bytesRead = ins.read(buffer, 0, len)) != -1) {
-                os.write(buffer, 0, bytesRead);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            CloseUtil.close(os);
-            CloseUtil.close(ins);
-        }
-        return file;
-    }
+	/**
+	 * 将文件名解析成文件的上传路径
+	 */
+	public static File upload(MultipartFile file, String filePath) {
+		Date date = new Date();
+		SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
+		String name = getFileNameNoEx(file.getOriginalFilename());
+		String suffix = getExtensionName(file.getOriginalFilename());
+		String nowStr = "-" + format.format(date);
+		try {
+			String fileName = name + nowStr + "." + suffix;
+			String path = filePath + fileName;
+			// getCanonicalFile 可解析正确各种路径
+			File dest = new File(path).getCanonicalFile();
+			// 检测是否存在目录
+			if (!dest.getParentFile().exists()) {
+				if (!dest.getParentFile().mkdirs()) {
+					System.out.println("was not successful.");
+				}
+			}
+			// 文件写入
+			file.transferTo(dest);
+			return dest;
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
 
-    /**
-     * 将文件名解析成文件的上传路径
-     */
-    public static File upload(MultipartFile file, String filePath) {
-        Date date = new Date();
-        SimpleDateFormat format = new SimpleDateFormat("yyyyMMddhhmmssS");
-        String name = getFileNameNoEx(file.getOriginalFilename());
-        String suffix = getExtensionName(file.getOriginalFilename());
-        String nowStr = "-" + format.format(date);
-        try {
-            String fileName = name + nowStr + "." + suffix;
-            String path = filePath + fileName;
-            // getCanonicalFile 可解析正确各种路径
-            File dest = new File(path).getCanonicalFile();
-            // 检测是否存在目录
-            if (!dest.getParentFile().exists()) {
-                if (!dest.getParentFile().mkdirs()) {
-                    System.out.println("was not successful.");
-                }
-            }
-            // 文件写入
-            file.transferTo(dest);
-            return dest;
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
+	/**
+	 * 将文件名解析成文件的上传路径
+	 */
+	public static String uploadFile(MultipartFile file, String filePath) {
 
-    /**
-     * 导出excel
-     */
-    public static void downloadExcel(List<Map<String, Object>> list, HttpServletResponse response) throws IOException {
-        String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
-        File file = new File(tempPath);
-        BigExcelWriter writer = ExcelUtil.getBigWriter(file);
-        // 一次性写出内容，使用默认样式，强制输出标题
-        writer.write(list, true);
-        SXSSFSheet sheet = (SXSSFSheet)writer.getSheet();
-        //上面需要强转SXSSFSheet  不然没有trackAllColumnsForAutoSizing方法
-        sheet.trackAllColumnsForAutoSizing();
-        //列宽自适应
-        writer.autoSizeColumnAll();
-        //response为HttpServletResponse对象
-        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
-        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
-        response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
-        ServletOutputStream out = response.getOutputStream();
-        // 终止后删除临时文件
-        file.deleteOnExit();
-        writer.flush(out, true);
-        //此处记得关闭输出Servlet流
-        IoUtil.close(out);
-    }
+		String name = UUIDGenerator.uuid();
+		String suffix = getExtensionName(file.getOriginalFilename());
+		try {
+			String fileName = name + "." + suffix;
+			// getCanonicalFile 可解析正确各种路径
+			File dest = new File(filePath + fileName).getCanonicalFile();
+			// 文件写入
+			file.transferTo(dest);
+			return fileName;
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+	/**
+	 * 将文件名解析成文件的上传路径
+	 */
+	public static String uploadFile(byte[] fileBtye, String filePath) {
 
-    public static String getFileType(String type) {
-        String documents = "txt doc pdf ppt pps xlsx xls docx";
-        String music = "mp3 wav wma mpa ram ra aac aif m4a";
-        String video = "avi mpg mpe mpeg asf wmv mov qt rm mp4 flv m4v webm ogv ogg";
-        String image = "bmp dib pcp dif wmf gif jpg tif eps psd cdr iff tga pcd mpt png jpeg";
-        if (image.contains(type)) {
-            return IMAGE;
-        } else if (documents.contains(type)) {
-            return TXT;
-        } else if (music.contains(type)) {
-            return MUSIC;
-        } else if (video.contains(type)) {
-            return VIDEO;
-        } else {
-            return OTHER;
-        }
-    }
+		String name = UUIDGenerator.uuid();
+		String suffix = "jpg";
+		try {
+			String fileName = name + "." + suffix;
+			// 文件写入
+			OutputStream os = new FileOutputStream(filePath+fileName);
+			os.write(fileBtye);
+			os.close();
+			return fileName;
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+	/**
+	 * 将文件名解析成文件的上传路径
+	 */
+	public static String getUploadPath(String filePath) {
+		Calendar calendar = Calendar.getInstance();
+		Date time = calendar.getTime();
+		SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd");
 
-    public static void checkSize(long maxSize, long size) {
-        // 1M
-        int len = 1024 * 1024;
-        if (size > (maxSize * len)) {
-            throw new BadRequestException("文件超出规定大小:" + maxSize + "MB");
-        }
-    }
+		String formatDate = format.format(time);
+		try {
+			String fileRelatePath =  formatDate + "/";
+			String createFilePath = filePath + fileRelatePath;
+			// getCanonicalFile 可解析正确各种路径
+			File dest = new File(createFilePath).getCanonicalFile();
+			// 检测是否存在目录
+			if (!dest.exists()) {
+				if (!dest.mkdirs()) {
+					System.out.println("was not successful.");
+				}
+			}
+			// 文件写入
+			
+			return fileRelatePath;
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
 
-    /**
-     * 判断两个文件是否相同
-     */
-    public static boolean check(File file1, File file2) {
-        String img1Md5 = getMd5(file1);
-        String img2Md5 = getMd5(file2);
-        if(img1Md5 != null){
-            return img1Md5.equals(img2Md5);
-        }
-        return false;
-    }
+	/**
+	 * 导出excel
+	 */
+	public static void downloadExcel(List<Map<String, Object>> list, HttpServletResponse response) throws IOException {
+		String tempPath = SYS_TEM_DIR + IdUtil.fastSimpleUUID() + ".xlsx";
+		File file = new File(tempPath);
+		BigExcelWriter writer = ExcelUtil.getBigWriter(file);
+		// 一次性写出内容，使用默认样式，强制输出标题
+		writer.write(list, true);
+		SXSSFSheet sheet = (SXSSFSheet) writer.getSheet();
+		// 上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法
+		sheet.trackAllColumnsForAutoSizing();
+		// 列宽自适应
+		writer.autoSizeColumnAll();
+		// response为HttpServletResponse对象
+		response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+		// test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+		response.setHeader("Content-Disposition", "attachment;filename=file.xlsx");
+		ServletOutputStream out = response.getOutputStream();
+		// 终止后删除临时文件
+		file.deleteOnExit();
+		writer.flush(out, true);
+		// 此处记得关闭输出Servlet流
+		IoUtil.close(out);
+	}
 
-    /**
-     * 判断两个文件是否相同
-     */
-    public static boolean check(String file1Md5, String file2Md5) {
-        return file1Md5.equals(file2Md5);
-    }
+	public static String getFileType(String type) {
+		String documents = "txt doc pdf ppt pps xlsx xls docx";
+		String music = "mp3 wav wma mpa ram ra aac aif m4a";
+		String video = "avi mpg mpe mpeg asf wmv mov qt rm mp4 flv m4v webm ogv ogg";
+		String image = "bmp dib pcp dif wmf gif jpg tif eps psd cdr iff tga pcd mpt png jpeg";
+		if (image.contains(type)) {
+			return IMAGE;
+		} else if (documents.contains(type)) {
+			return TXT;
+		} else if (music.contains(type)) {
+			return MUSIC;
+		} else if (video.contains(type)) {
+			return VIDEO;
+		} else {
+			return OTHER;
+		}
+	}
 
-    private static byte[] getByte(File file) {
-        // 得到文件长度
-        byte[] b = new byte[(int) file.length()];
-        InputStream in = null;
-        try {
-            in = new FileInputStream(file);
-            try {
-                System.out.println(in.read(b));
-            } catch (IOException e) {
-                log.error(e.getMessage(), e);
-            }
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            return null;
-        } finally {
-            CloseUtil.close(in);
-        }
-        return b;
-    }
+	public static void checkSize(long maxSize, long size) {
+		// 1M
+		int len = 1024 * 1024;
+		if (size > (maxSize * len)) {
+			throw new BadRequestException("文件超出规定大小:" + maxSize + "MB");
+		}
+	}
 
-    private static String getMd5(byte[] bytes) {
-        // 16进制字符
-        char[] hexDigits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-        try {
-            MessageDigest mdTemp = MessageDigest.getInstance("MD5");
-            mdTemp.update(bytes);
-            byte[] md = mdTemp.digest();
-            int j = md.length;
-            char[] str = new char[j * 2];
-            int k = 0;
-            // 移位 输出字符串
-            for (byte byte0 : md) {
-                str[k++] = hexDigits[byte0 >>> 4 & 0xf];
-                str[k++] = hexDigits[byte0 & 0xf];
-            }
-            return new String(str);
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
+	/**
+	 * 判断两个文件是否相同
+	 */
+	public static boolean check(File file1, File file2) {
+		String img1Md5 = getMd5(file1);
+		String img2Md5 = getMd5(file2);
+		if (img1Md5 != null) {
+			return img1Md5.equals(img2Md5);
+		}
+		return false;
+	}
 
-    /**
-     * 下载文件
-     *
-     * @param request  /
-     * @param response /
-     * @param file     /
-     */
-    public static void downloadFile(HttpServletRequest request, HttpServletResponse response, File file, boolean deleteOnExit) {
-        response.setCharacterEncoding(request.getCharacterEncoding());
-        response.setContentType("application/octet-stream");
-        FileInputStream fis = null;
-        try {
-            fis = new FileInputStream(file);
-            response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
-            IOUtils.copy(fis, response.getOutputStream());
-            response.flushBuffer();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        } finally {
-            if (fis != null) {
-                try {
-                    fis.close();
-                    if (deleteOnExit) {
-                        file.deleteOnExit();
-                    }
-                } catch (IOException e) {
-                    log.error(e.getMessage(), e);
-                }
-            }
-        }
-    }
+	/**
+	 * 判断两个文件是否相同
+	 */
+	public static boolean check(String file1Md5, String file2Md5) {
+		return file1Md5.equals(file2Md5);
+	}
 
-    public static String getMd5(File file) {
-        return getMd5(getByte(file));
-    }
+	private static byte[] getByte(File file) {
+		// 得到文件长度
+		byte[] b = new byte[(int) file.length()];
+		InputStream in = null;
+		try {
+			in = new FileInputStream(file);
+			try {
+				System.out.println(in.read(b));
+			} catch (IOException e) {
+				log.error(e.getMessage(), e);
+			}
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return null;
+		} finally {
+			CloseUtil.close(in);
+		}
+		return b;
+	}
+
+	private static String getMd5(byte[] bytes) {
+		// 16进制字符
+		char[] hexDigits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+		try {
+			MessageDigest mdTemp = MessageDigest.getInstance("MD5");
+			mdTemp.update(bytes);
+			byte[] md = mdTemp.digest();
+			int j = md.length;
+			char[] str = new char[j * 2];
+			int k = 0;
+			// 移位 输出字符串
+			for (byte byte0 : md) {
+				str[k++] = hexDigits[byte0 >>> 4 & 0xf];
+				str[k++] = hexDigits[byte0 & 0xf];
+			}
+			return new String(str);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return null;
+	}
+
+	/**
+	 * 下载文件
+	 *
+	 * @param request  /
+	 * @param response /
+	 * @param file     /
+	 */
+	public static void downloadFile(HttpServletRequest request, HttpServletResponse response, File file,
+			boolean deleteOnExit) {
+		response.setCharacterEncoding(request.getCharacterEncoding());
+		response.setContentType("application/octet-stream");
+		FileInputStream fis = null;
+		try {
+			fis = new FileInputStream(file);
+			response.setHeader("Content-Disposition", "attachment; filename=" + file.getName());
+			IOUtils.copy(fis, response.getOutputStream());
+			response.flushBuffer();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		} finally {
+			if (fis != null) {
+				try {
+					fis.close();
+					if (deleteOnExit) {
+						file.deleteOnExit();
+					}
+				} catch (IOException e) {
+					log.error(e.getMessage(), e);
+				}
+			}
+		}
+	}
+
+	public static String getMd5(File file) {
+		return getMd5(getByte(file));
+	}
+	public static void main(String[] args) {
+		getUploadPath("C:\\eladmin\\file\\");
+	}
 }

eladmin-common/src/main/java/me/zhengjie/utils/UUIDGenerator.java

@@ -0,0 +1,32 @@
+package me.zhengjie.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+import java.util.UUID;
+
+public class UUIDGenerator {
+	public static String uuid() {
+
+		return UUID.randomUUID().toString().replace("-", "");
+	}
+	public static String getNo() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+		Date currentTime = new Date();
+		String businessNo = sdf.format(currentTime);
+		//String businessNo = str + (int) (Math.random() * 1000.0D);
+		return businessNo;
+	}
+	public static String getIdNo() {
+		return "100" + getNo() + getRandom();
+	}
+
+	public static String getRandom() {
+		Random random = new Random();
+		String s = "";
+		while (s.length() < 4) {
+			s += random.nextInt(10);
+		}
+		return s;
+	}
+}

eladmin-system/application.pid

@@ -1 +1 @@
-11484
+7400

eladmin-system/pom.xml

@@ -16,6 +16,10 @@
 		<jjwt.version>0.11.2</jjwt.version>
 		<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
 		<jna.version>5.8.0</jna.version>
+		<zefer.fonts.version>1.0</zefer.fonts.version>
+		<zefer.pd4ml.version>370fx2pro</zefer.pd4ml.version>
+		<zefer.ss_css.version>1.0</zefer.ss_css.version>
+		<zefer.fonts.version>1.0</zefer.fonts.version>
 	</properties>
 
 	<dependencies>
@@ -39,6 +43,7 @@
 			<version>0.0.1</version>
 		</dependency>
 
+
 		<!-- Spring boot websocket -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -67,7 +72,11 @@
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.68</version>
+		</dependency>
 		<!-- linux的管理 -->
 		<dependency>
 			<groupId>ch.ethz.ganymed</groupId>
@@ -87,17 +96,21 @@
 			<version>6.1.4</version>
 		</dependency>
 		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+			<version>1.13.1</version>
+		</dependency>
+		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<version>3.5.1</version>
 		</dependency>
-		<!-- <dependency> <groupId>cn.hutool</groupId> <artifactId>hutool-all</artifactId> 
-			<version>${hu.tu}</version> </dependency> -->
 		<dependency>
-			<groupId>org.apache.pdfbox</groupId>
-			<artifactId>pdfbox</artifactId>
-			<version>3.0.0-alpha3</version>
+			<groupId>com.openhtmltopdf</groupId>
+			<artifactId>openhtmltopdf-pdfbox</artifactId>
+			<version>1.0.10</version>
 		</dependency>
+
 	</dependencies>
 
 	<!-- 打包 -->
@@ -106,6 +119,36 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<fork>true</fork>
+					<includeSystemScope>true</includeSystemScope>
+					<includes>
+						<include>
+							<groupId>${project.groupId}</groupId>
+							<artifactId>${project.artifactId}</artifactId>
+						</include>
+					</includes>
+					<layout>ZIP</layout>
+					<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/jar</outputDirectory>
+							<excludeTransitive>false</excludeTransitive>
+							<stripVersion>false</stripVersion>
+						</configuration>
+					</execution>
+				</executions>
 			</plugin>
 			<!-- 跳过单元测试 -->
 			<plugin>

eladmin-system/src/main/java/me/zhengjie/archives/controller/ArchivesController.java

@@ -0,0 +1,134 @@
+package me.zhengjie.archives.controller;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import me.zhengjie.annotation.rest.AnonymousGetMapping;
+import me.zhengjie.annotation.rest.AnonymousPostMapping;
+import me.zhengjie.archives.entity.ArchivesEntity;
+import me.zhengjie.archives.service.ArchivesService;
+import me.zhengjie.archives.vo.ArchivesVo;
+import me.zhengjie.archives.vo.CasePortraitVo;
+import me.zhengjie.archives.vo.PageResultVo;
+import me.zhengjie.base.ResponseDTO;
+import me.zhengjie.modules.system.service.DictDetailService;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author <a href="https://www.fengwenyi.com?code">Erwin Feng</a>
+ * @since 2023-04-18
+ */
+@RestController
+@RequestMapping("/api/archives")
+public class ArchivesController {
+	@Autowired
+	DictDetailService dictDetailService;
+	@Autowired
+	ArchivesService archivesService;
+
+
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 * @throws Exception
+	 */
+	@AnonymousPostMapping("/mergeSubmit")
+	public ResponseDTO<Map<String, String>> mergeSubmit(@RequestBody CasePortraitVo archives) throws Exception {
+		archivesService.mergeSubmit(archives);
+		return ResponseDTO.success();
+	}
+
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+	@AnonymousPostMapping("/save")
+	public ResponseDTO<Map<String, String>> save(@RequestBody ArchivesEntity archives) {
+		archives.setCreateBy("1");
+		archives.setUpdateBy("1");
+		archives.setIsDelete("1");
+		archives.setStatus("0");
+		archives.setCreateTime(LocalDateTime.now());
+		archives.setUpdateTime(LocalDateTime.now());
+		archivesService.save(archives);
+		return ResponseDTO.success();
+	}
+
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+	@AnonymousPostMapping("/edit")
+	public ResponseDTO<ArchivesEntity> edit(@RequestBody ArchivesVo archives) {
+		ArchivesEntity entity = new ArchivesEntity();
+		entity = archivesService.getById(archives.getId());
+		 String	previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
+		 entity.setPdfPath(previewPath + entity.getPdfPath());
+		return ResponseDTO.success(entity);
+	}
+
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+	@AnonymousPostMapping("/delete")
+	public ResponseDTO<ArchivesEntity> delete(@RequestBody List<String> id) {
+
+		List<ArchivesEntity> list = new ArrayList<ArchivesEntity>();
+		for (int i = 0; i < id.size(); i++) {
+			ArchivesEntity entity = new ArchivesEntity();
+			entity.setId(Long.valueOf(id.get(i)));
+			entity.setIsDelete("0");
+			list.add(entity);
+		}
+
+		archivesService.updateBatchById(list);
+		return ResponseDTO.success();
+	}
+
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+	@AnonymousGetMapping("/list")
+	public ResponseEntity<Object> list(ArchivesVo archives, Pageable pageable) {
+		
+		archives.setIndex(pageable.getPageNumber());
+		archives.setSize(pageable.getPageSize());
+		Map<String, Object> map = archivesService.page(archives);
+
+		return new ResponseEntity<>(map, HttpStatus.OK);
+	}
+
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+//	@AnonymousPostMapping("/list")
+//	public ResponseDTO<PageResultVo<List<ArchivesEntity>>> list(@RequestBody ArchivesVo archives) {
+//		// PageResultVo<List<ArchivesEntity>> page = archivesService.page(archives);
+//
+//		return ResponseDTO.success(null);
+//	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/controller/FileInfoController.java

@@ -0,0 +1,44 @@
+package me.zhengjie.archives.controller;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import me.zhengjie.annotation.rest.AnonymousPostMapping;
+import me.zhengjie.archives.dto.FilePreviewDto;
+import me.zhengjie.archives.service.FileInfoService;
+import me.zhengjie.archives.vo.FileUploadVO;
+import me.zhengjie.base.ResponseDTO;
+
+@RestController
+@RequestMapping("/api/fileInfo")
+public class FileInfoController {
+	@Autowired
+	private FileInfoService fileInfoService;
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+	@AnonymousPostMapping("/uploadFiles")
+	public ResponseDTO<List<FilePreviewDto>> uploadFiles(MultipartFile[] files) {
+		 
+		return ResponseDTO.success(fileInfoService.getFilePath(files));
+	}
+	/**
+	 * 文件和图片
+	 *
+	 * @return
+	 */
+	@AnonymousPostMapping("/uploadBase64")
+	public ResponseDTO<List<FilePreviewDto>> uploadBase64(@RequestBody FileUploadVO fileVo) {
+		
+		//;
+		return ResponseDTO.success(fileInfoService.getFilePath(fileVo.getFiles()));
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/dao/IArchivesDao.java

@@ -0,0 +1,21 @@
+package me.zhengjie.archives.dao;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import me.zhengjie.archives.entity.ArchivesEntity;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author <a href="https://www.fengwenyi.com?code">Erwin Feng</a>
+ * @since 2023-04-18
+ */
+@Mapper
+public interface IArchivesDao extends BaseMapper<ArchivesEntity> {
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/dao/IFileInfoDao.java

@@ -0,0 +1,21 @@
+package me.zhengjie.archives.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import me.zhengjie.archives.entity.FileInfoEntity;
+
+
+/**
+ * <p>
+ * 文件上传记录表 Mapper 接口
+ * </p>
+ *
+ * @author humuyu
+ * @since 2022-03-10
+ */
+@Mapper
+public interface IFileInfoDao extends BaseMapper<FileInfoEntity> {
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/dao/IModelDao.java

@@ -0,0 +1,15 @@
+package me.zhengjie.archives.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import me.zhengjie.archives.entity.ModelEntity;
+
+/**
+ * Model Mapper 接口
+ */
+@Mapper
+public interface IModelDao extends BaseMapper<ModelEntity> {
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/dto/FilePreviewDto.java

@@ -0,0 +1,13 @@
+package me.zhengjie.archives.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class FilePreviewDto {
+	private String fileId;
+	private String fileUrl;
+}

eladmin-system/src/main/java/me/zhengjie/archives/entity/ArchivesEntity.java

@@ -0,0 +1,235 @@
+package me.zhengjie.archives.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Getter;
+import lombok.Setter;
+import me.zhengjie.archives.plus.QueryKeyword;
+import me.zhengjie.archives.plus.QueryWapper;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author <a href="https://www.fengwenyi.com?code">Erwin Feng</a>
+ * @since 2023-04-18
+ */
+@TableName("archives")
+@Getter
+@Setter
+public class ArchivesEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 案卷类型
+     */
+    @TableField("dossier_type")
+    private String dossierType;
+    /**
+     * 档案号
+     */
+    @QueryWapper({QueryKeyword.LIKE})
+    @TableField("archives_num")
+    private String archivesNum;
+    /**
+          * 卷宗号
+     */
+    @QueryWapper({QueryKeyword.LIKE})
+    @TableField("dossier_num")
+    private String dossierNum;
+    /**
+          * 公证类型
+     */
+    @TableField("notarization_type")
+    private String notarizationType;
+
+    /**
+     *  公证事项
+     */
+    @TableField("notarized_item")
+    private String notarizedItem;
+
+    /**
+     * 公证书编号
+     */
+    @TableField("notarial_num")
+    private String notarialNum;
+
+    /**
+     * 公证员
+     */
+    @TableField("notary")
+    private String notary;
+
+    /**
+     * 当事人姓名
+     */
+    @QueryWapper({QueryKeyword.LIKE})
+    @TableField("party_name")
+    private String partyName;
+
+    /**
+     * 受理号
+     */
+    @TableField("accept_num")
+    private String acceptNum;
+
+    /**
+     *  承办人
+     */
+    @TableField("undertaker")
+    private String undertaker;
+
+    /**
+     * 年度
+     */
+    @TableField("annual")
+    private String annual;
+
+    /**
+     * 受理日期
+     */
+    @TableField("accept_date")
+    private String acceptDate;
+
+    /**
+     * 办结日期
+     */
+    @TableField("complete_date")
+    private String completeDate;
+
+    /**
+     * 归档日期
+     */
+    @TableField("filing_date")
+    private String filingDate;
+
+    /**
+     * 保密类型0：非密卷，1：密卷
+     */
+    @TableField("secrecy_type")
+    private String secrecyType;
+
+    /**
+     * 保管期限，1：永久，2：长期 3：短期
+     */
+    @TableField("save_term")
+    private String saveTerm;
+
+    /**
+     * 公证处名称
+     */
+    @TableField("notary_full_name")
+    private String notaryFullName;
+
+    /**
+     * 目录号
+     */
+    @TableField("catalog_num")
+    private String catalogNum;
+
+    /**
+     * 案卷号
+     */
+    @TableField("case_num")
+    private String caseNum;
+
+    /**
+     * 全宗号
+     */
+    @TableField("fonds_num")
+    private String fondsNum;
+
+    /**
+     * 盒号
+     */
+    @TableField("box_num")
+    private String boxNum;
+    /**
+     * 盒号
+     */
+    @TableField("pdf_path")
+    private String pdfPath;
+    /**
+     * 状态,0未扫描，1已提交
+     */
+    @TableField("status")
+    private String status;
+
+    /**
+     * 创建者
+     */
+    @TableField("create_by")
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    @TableField("update_by")
+    private String updateBy;
+
+    /**
+     * 创建日期
+    
+     */
+    @QueryWapper({QueryKeyword.DESC})
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("is_delete")
+    private String isDelete;
+ 
+    @Override
+    public String toString() {
+        return "ArchivesEntity{" +
+        "id=" + id +
+        ", dossierType=" + dossierType +
+        ", notarizationType=" + notarizationType +
+        ", notarizedItem=" + notarizedItem +
+        ", notarialNum=" + notarialNum +
+        ", notary=" + notary +
+        ", partyName=" + partyName +
+        ", acceptNum=" + acceptNum +
+        ", undertaker=" + undertaker +
+        ", annual=" + annual +
+        ", acceptDate=" + acceptDate +
+        ", completeDate=" + completeDate +
+        ", filingDate=" + filingDate +
+        ", secrecyType=" + secrecyType +
+        ", saveTerm=" + saveTerm +
+        ", notaryFullName=" + notaryFullName +
+        ", catalogNum=" + catalogNum +
+        ", caseNum=" + caseNum +
+        ", fondsNum=" + fondsNum +
+        ", boxNum=" + boxNum +
+        ", status=" + status +
+        ", createBy=" + createBy +
+        ", updateBy=" + updateBy +
+        ", createTime=" + createTime +
+        ", updateTime=" + updateTime +
+        "}";
+    }
+}

eladmin-system/src/main/java/me/zhengjie/archives/entity/FileInfoEntity.java

@@ -0,0 +1,108 @@
+package me.zhengjie.archives.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.ToString;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 文件上传记录表
+ * </p>
+ *
+ * @author humuyu
+ * @since 2022-03-10
+ */
+@TableName("file_info")
+@ToString
+public class FileInfoEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 主键id
+	 */
+	@TableId(value = "id", type = IdType.INPUT)
+	private String id;
+
+	@TableField("file_name")
+	private String fileName;
+
+	/**
+	 * oss存储路径
+	 */
+	@TableField("path")
+	private String path;
+
+	/**
+	 * 文件状态 1-可用，0-废弃
+	 */
+	@TableField("status")
+	private Integer status;
+
+	@TableField("create_time")
+	private LocalDateTime createTime;
+
+	@TableField("update_time")
+	private LocalDateTime updateTime;
+
+	public String getId() {
+		return id;
+	}
+
+	public FileInfoEntity setId(String id) {
+		this.id = id;
+		return this;
+	}
+
+	public String getFileName() {
+		return fileName;
+	}
+
+	public FileInfoEntity setFileName(String fileName) {
+		this.fileName = fileName;
+		return this;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public FileInfoEntity setPath(String path) {
+		this.path = path;
+		return this;
+	}
+
+	public Integer getStatus() {
+		return status;
+	}
+
+	public FileInfoEntity setStatus(Integer status) {
+		this.status = status;
+		return this;
+	}
+
+	public LocalDateTime getCreateTime() {
+		return createTime;
+	}
+
+	public FileInfoEntity setCreateTime(LocalDateTime createTime) {
+		this.createTime = createTime;
+		return this;
+	}
+
+	public LocalDateTime getUpdateTime() {
+		return updateTime;
+	}
+
+	public FileInfoEntity setUpdateTime(LocalDateTime updateTime) {
+		this.updateTime = updateTime;
+		return this;
+	}
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/entity/ModelEntity.java

@@ -0,0 +1,47 @@
+package me.zhengjie.archives.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 模板
+ */
+@Getter
+@Setter
+@TableName("model")
+public class ModelEntity implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+
+	@TableField("code")
+	private String code;
+
+	@TableField("title")
+	private String title;
+
+	@TableField("content")
+	private String content;
+
+	@TableField("ifModify")
+	private int ifModify;
+
+	@TableField("sort")
+	private int sort;
+
+	@TableField("status")
+	private int status;
+
+	@TableField("create_time")
+	private Date createTime;
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/AbstractService.java

@@ -0,0 +1,218 @@
+package me.zhengjie.archives.plus;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+import org.apache.ibatis.reflection.property.PropertyNamer;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
+import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+public interface AbstractService<T> extends IService<T> {
+	static final Log logger = LogFactory.getLog(AbstractService.class);
+
+	/**
+	 * 博客地址：https://blog.csdn.net/qq_19266669/article/details/114369195
+	 * 查看AbstractLambdaWrapper通过方法得到字段名称
+	 * 
+	 * @param column
+	 * @return
+	 */
+	default String columnToString(SFunction<T, ?> column) {
+		return column.toString();
+	};
+
+	/**
+	 * 根据 entity 条件，删除记录
+	 *
+	 * @param queryWrapper 实体包装类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default boolean remove(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return remove(queryWrapper);
+	}
+
+	/**
+	 * 根据 whereEntity 条件，更新记录
+	 *
+	 * @param entity        实体对象
+	 * @param updateWrapper 实体对象封装操作类
+	 *                      {@link com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper}
+	 * @throws SecurityException
+	 * @throws NoSuchFieldException
+	 */
+	default boolean update(T entity, SFunction<T, ?> column, Object value) {
+		try {
+			UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+			// 这里使用反射得到字段，
+			String conditions = columnToString(column);
+			updateWrapper.eq(conditions, value);
+			return update(entity, updateWrapper);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+
+	/**
+	 * 根据 whereEntity 条件，更新记录
+	 *
+	 * @param entity        实体对象
+	 * @param updateWrapper 实体对象封装操作类
+	 *                      {@link com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper}
+	 * @throws SecurityException
+	 * @throws NoSuchFieldException
+	 */
+	default boolean update(T entity, String column, Object value) {
+		try {
+			UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+			updateWrapper.eq(column, value);
+			return update(entity, updateWrapper);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+
+	default boolean update(T entity, SFunction<T, ?> column) {
+		// 这里是反射，通过反射来得到
+
+//		Field startRange = clazz.getDeclaredField(attribute[0]);
+//		startRange.setAccessible(true);
+//		Object val = startRange.get(obj);
+		try {
+			String columnName = columnToString(column);
+			String fieldName = getFieldName(column);
+			Class<?> clazz = entity.getClass();
+			Field field = clazz.getDeclaredField(fieldName);
+			// 抑制Java对修饰符的检查
+			field.setAccessible(true);
+			Object value = field.get(entity);
+			field.set(entity, null);
+			return update(entity, columnName, value);
+		} catch (Exception e) {
+			logger.error("update class" + entity.getClass() + " exception :" + e.getMessage());
+			return false;
+		}
+
+	}
+
+	default String getFieldName(SFunction<T, ?> column) {
+		LambdaMeta meta = LambdaUtils.extract(column);
+		String fieldName = PropertyNamer.methodToProperty(meta.getImplMethodName());
+		return fieldName;
+
+	}
+
+	default boolean update(T entity, SFunction<T, ?> column, Collection<?> coll) {
+		UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+		// 这里使用反射得到字段，
+		try {
+			String conditions = columnToString(column);
+			updateWrapper.in(conditions, coll);
+			return update(entity, updateWrapper);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return false;
+	}
+
+	default boolean update(T entity, String conditions, Object... values) {
+		UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
+
+		updateWrapper.in(conditions, values);
+
+		return update(entity, updateWrapper);
+	}
+
+	/**
+	 * 根据 Wrapper，查询一条记录 <br/>
+	 * <p>
+	 * 结果集，如果是多个会抛出异常，随机取一条加上限制条件 wrapper.last("LIMIT 1")
+	 * </p>
+	 *
+	 * @param queryWrapper 实体对象封装操作类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default T getOne(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return getOne(queryWrapper, true);
+	}
+
+	default Map<String, Object> getMap(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return getMap(queryWrapper);
+	}
+
+	/**
+	 * 根据 Wrapper 条件，查询总记录数
+	 *
+	 * @param queryWrapper 实体对象封装操作类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default long count(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return count(queryWrapper);
+	}
+
+	/**
+	 * 查询列表
+	 *
+	 * @param queryWrapper 实体对象封装操作类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default List<T> list(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return list(queryWrapper);
+	}
+
+	/**
+	 * 查询列表
+	 *
+	 * @param queryWrapper 实体对象封装操作类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default List<Map<String, Object>> listMaps(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return listMaps(queryWrapper);
+	}
+
+	/**
+	 * 根据 Wrapper 条件，查询全部记录
+	 *
+	 * @param queryWrapper 实体对象封装操作类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default List<Object> listObjs(T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		return listObjs(queryWrapper);
+	}
+
+	/**
+	 * 翻页查询
+	 *
+	 * @param page         翻页对象
+	 * @param queryWrapper 实体对象封装操作类
+	 *                     {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
+	 */
+	default <E extends IPage<T>> E page(E page, T t) {
+		Wrapper<T> queryWrapper = QueryWrapperUtil.convertQuery(t);
+		try {
+			return page(page, queryWrapper);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/AbstractServiceImpl.java

@@ -0,0 +1,77 @@
+package me.zhengjie.archives.plus;
+
+import java.util.Map;
+
+import org.apache.ibatis.reflection.property.PropertyNamer;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Assert;
+import com.baomidou.mybatisplus.core.toolkit.LambdaUtils;
+import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache;
+import com.baomidou.mybatisplus.core.toolkit.support.LambdaMeta;
+import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * public class AbstractServiceImpl<M , T> extends ServiceImpl<BaseMapper<T>, T>
+ * implements AbstractService<T> IService 实现类（ 泛型：M 是 mapper 对象，T 是实体 ）
+ * 实现的时候要注意和父类有相同的方式
+ * 
+ * 
+ * 
+ * @author hubin
+ * @since 2018-06-23
+ */
+public class AbstractServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements AbstractService<T> {
+
+	private Map<String, ColumnCache> columnMap = null;
+
+	private boolean initColumnMap = false;
+
+	// 通过方法的名称找到属性名称，com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper的类copy的
+	@Override
+	public String columnToString(SFunction<T, ?> column) {
+		return columnToString(column, true);
+	}
+
+	protected String columnToString(SFunction<T, ?> column, boolean onlyColumn) {
+		ColumnCache cache = getColumnCache(column);
+		return onlyColumn ? cache.getColumn() : cache.getColumnSelect();
+	}
+
+	/**
+	 * 获取 SerializedLambda 对应的列信息，从 lambda 表达式中推测实体类
+	 * <p>
+	 * 如果获取不到列信息，那么本次条件组装将会失败
+	 *
+	 * @return 列
+	 * @throws com.baomidou.mybatisplus.core.exceptions.MybatisPlusException 获取不到列信息时抛出异常
+	 */
+	protected ColumnCache getColumnCache(SFunction<T, ?> column) {
+		LambdaMeta meta = LambdaUtils.extract(column);
+		String fieldName = PropertyNamer.methodToProperty(meta.getImplMethodName());
+		Class<?> instantiatedClass = meta.getInstantiatedClass();
+		tryInitCache(instantiatedClass);
+		return getColumnCache(fieldName, instantiatedClass);
+	}
+
+	private ColumnCache getColumnCache(String fieldName, Class<?> lambdaClass) {
+		ColumnCache columnCache = columnMap.get(LambdaUtils.formatKey(fieldName));
+		Assert.notNull(columnCache, "can not find lambda cache for this property [%s] of entity [%s]", fieldName,
+				lambdaClass.getName());
+		return columnCache;
+	}
+
+	private void tryInitCache(Class<?> lambdaClass) {
+		if (!initColumnMap) {
+			final Class<T> entityClass = getEntityClass();
+			if (entityClass != null) {
+				lambdaClass = entityClass;
+			}
+			columnMap = LambdaUtils.getColumnMap(lambdaClass);
+			Assert.notNull(columnMap, "can not find lambda cache for this entity [%s]", lambdaClass.getName());
+			initColumnMap = true;
+		}
+	}
+	
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/QueryEntity.java

@@ -0,0 +1,17 @@
+package me.zhengjie.archives.plus;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class QueryEntity {
+	// 开始时间
+	@TableField(exist = false)
+	private String startDate;
+	// 结束时间
+	@TableField(exist = false)
+	private String endDate;
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/QueryKeyword.java

@@ -0,0 +1,50 @@
+package me.zhengjie.archives.plus;
+
+
+import com.baomidou.mybatisplus.core.conditions.ISqlSegment;
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import lombok.AllArgsConstructor;
+
+/**
+ * SQL 保留关键字枚举,{@link SqlKeyword}
+ *
+ * @author hubin
+ * @since 2018-05-28
+ */
+@AllArgsConstructor
+public enum QueryKeyword implements ISqlSegment {
+    AND("AND"),
+    OR("OR"),
+    NOT("NOT"),
+    IN("IN"),
+    NOT_IN("NOT IN"),
+    LIKE("LIKE"),
+    NOT_LIKE("NOT LIKE"),
+    EQ(StringPool.EQUALS),
+    NE("<>"),
+    GT(StringPool.RIGHT_CHEV),
+    GE(">="),
+    LT(StringPool.LEFT_CHEV),
+    LE("<="),
+    IS_NULL("IS NULL"),
+    IS_NOT_NULL("IS NOT NULL"),
+    GROUP_BY("GROUP BY"),
+    HAVING("HAVING"),
+    ORDER_BY("ORDER BY"),
+    EXISTS("EXISTS"),
+    NOT_EXISTS("NOT EXISTS"),
+    BETWEEN("BETWEEN"),
+    NOT_BETWEEN("NOT BETWEEN"),
+    ASC("ASC"),
+    DESC("DESC"),
+	LIKE_LEFT("likeLeft"),
+	LIKE_RIGHT("likeRight"),
+	RANGE("RANGE"),
+	;
+    private final String keyword;
+
+    @Override
+    public String getSqlSegment() {
+        return this.keyword;
+    }
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/QueryMapUtil.java

@@ -0,0 +1,20 @@
+package me.zhengjie.archives.plus;
+
+import java.util.Map;
+
+public class QueryMapUtil {
+	Map<String, Object> map;
+
+	public Map<String, Object> getMap() {
+		return map;
+	}
+
+	public void setMap(Map<String, Object> map) {
+		this.map = map;
+	}
+
+	public QueryMapUtil() {
+
+	}
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/QueryWapper.java

@@ -0,0 +1,17 @@
+package me.zhengjie.archives.plus;
+
+import org.springframework.stereotype.Indexed;
+
+import java.lang.annotation.*;
+
+@Target({ ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Indexed
+public @interface QueryWapper {
+
+	QueryKeyword[] value();
+
+	// 查询时间的范围
+	String[] attribute() default "";
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/QueryWapperEnum.java

@@ -0,0 +1,20 @@
+package me.zhengjie.archives.plus;
+
+/**
+ * @Description 查询枚举类
+ * @Date 2020-07-16 16:10
+ */
+public enum QueryWapperEnum {
+
+	LIKE(1), EQ(2);
+
+	private final int value;
+
+	QueryWapperEnum(int value) {
+		this.value = value;
+	}
+
+	public int value() {
+		return this.value;
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/plus/QueryWrapperUtil.java

@@ -0,0 +1,229 @@
+package me.zhengjie.archives.plus;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.jar.Attributes;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.ReflectionUtils;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+/**
+ * @Description 拼接查询条件工具类
+ */
+public class QueryWrapperUtil {
+
+	/**
+	 * 得到父类的对象
+	 * 
+	 * @param <T>   查询的泛型
+	 * @param clazz
+	 * @return
+	 */
+	public static <T> List<Field> reflectForField(Class<T> clazz) {
+		Class<?> tmpClazz = clazz;
+		List<Field> fieldList = new ArrayList<>();
+		while (tmpClazz != null) {
+			fieldList.addAll(Arrays.asList(tmpClazz.getDeclaredFields()));
+			tmpClazz = tmpClazz.getSuperclass();
+		}
+		return fieldList;
+	}
+
+	/**
+	 * 拼接查询条件
+	 *
+	 * @param obj 数据实体
+	 * @return void 返回参数说明
+	 * @exception/throws
+	 */
+	public static <T> QueryWrapper<T> convertQuery(Object obj, QueryMapUtil... jsonObj) {
+		Map<String, Object> param = new JSONObject();
+		if (ArrayUtils.isNotEmpty(jsonObj)) {
+
+			param = jsonObj[0].getMap();
+		}
+		QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+		Class<?> clazz = obj.getClass();
+		Method method = null;
+		try {
+			// TODO 这里应该通过共有方法来进行反射
+			for (Field field : reflectForField(clazz)) {
+
+				// 抑制Java对修饰符的检查
+//				field.setAccessible(true);
+				// 获取属性值
+//				Object fieldValue = field.get(obj);
+//            String fieldValue = getFieldValue(obj ,field.getName()).toString();
+				TableField tableField = AnnotationUtils.getAnnotation(field, TableField.class);
+				// 字段没有TableField这个注解和有这个主机上false的
+				if (ObjectUtils.isEmpty(tableField) || !tableField.exist()) {
+					continue;
+				}
+				// String methodName = "set" + filedName.substring(0, 1).toUpperCase() +
+				// filedName.substring(1);
+				// 获取属性名
+				String name = field.getName();
+				// 声明属性描述对象
+//				PropertyDescriptor propertyDescriptor = new PropertyDescriptor(name, clazz);
+//				Method method = clazz.getDeclaredMethod(propertyName);
+				// 获取getter方法
+//				Method method = propertyDescriptor.getReadMethod();
+				String getMethod = getMethod(name);
+				method = ReflectionUtils.findMethod(clazz, getMethod);
+				if (method == null) {
+					continue;
+				}
+				Object fieldValue = method.invoke(obj);
+				String fieldName = tableField.value();
+				// 默认是相等
+				QueryWapper queryWapperAnnotation = AnnotationUtils.getAnnotation(field, QueryWapper.class);
+
+				if (ObjectUtils.isEmpty(queryWapperAnnotation)) {
+					queryWrapper.eq(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+				} else {
+					// 获取枚举
+					QueryKeyword[] queryWapperEnums = queryWapperAnnotation.value();
+					for (QueryKeyword queryWapperEnum : queryWapperEnums) {
+						// 拼接查询条件
+						switch (queryWapperEnum) {
+						case NE:
+							queryWrapper.ne(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						// 这里需要，修改为集合
+						case IN:
+							if (fieldValue != null && fieldValue.toString().contains(",")) {
+								List<String> result = Arrays.asList(fieldValue.toString().split(","));
+								queryWrapper.in(!ObjectUtils.isEmpty(fieldValue), fieldName, result);
+							}
+							break;
+						case GT:
+							queryWrapper.gt(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case GE:
+							queryWrapper.ge(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case LT:
+							queryWrapper.lt(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case LE:
+							queryWrapper.le(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case LIKE:
+							queryWrapper.like(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case NOT_LIKE:
+							queryWrapper.notLike(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case LIKE_LEFT:
+							queryWrapper.likeLeft(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case LIKE_RIGHT:
+							queryWrapper.likeRight(!ObjectUtils.isEmpty(fieldValue), fieldName, fieldValue);
+							break;
+						case DESC:
+							queryWrapper.orderByDesc(fieldName);
+							break;
+						case ASC:
+							queryWrapper.orderByAsc(fieldName);
+							break;
+						case RANGE:
+							// 设置开始的值和结束的值
+							String[] attribute = queryWapperAnnotation.attribute();
+							String startRange = attribute[0];
+							// 声明属性描述对象
+							getMethod = getMethod(startRange);
+							method = ReflectionUtils.findMethod(clazz, getMethod);
+							if (method != null) {
+								Object val = method.invoke(obj);
+								if (!ObjectUtils.isEmpty(val)) {
+									queryWrapper.ge(fieldName, val);
+								}
+							}
+							// 得到开始的属性值，通过反射设置属性值
+//							Field startRange = clazz.getDeclaredField(attribute[0]);
+//							startRange.setAccessible(true);
+//							Object val = startRange.get(obj);
+							// 结束的属性值，通过反射设置属性值
+							String endRange = attribute[1];
+							getMethod = getMethod(endRange);
+							// 获取getter方法
+							method = ReflectionUtils.findMethod(clazz, getMethod);
+							if (method != null) {
+								Object val = method.invoke(obj);
+								if (!ObjectUtils.isEmpty(val)) {
+									queryWrapper.le(fieldName, val);
+								}
+							}
+							// ---属性值查询结束的值----
+							// 通过传入的参数查询值
+							// 然后通过参数查询
+							Object val = param.get(attribute[0]);
+							if (!ObjectUtils.isEmpty(val)) {
+								queryWrapper.ge(fieldName, val);
+							}
+							// 然后通过参数查询
+							val = param.get(attribute[1]);
+							if (!ObjectUtils.isEmpty(val)) {
+								queryWrapper.le(fieldName, val);
+							}
+							break;
+						default:
+							break;
+						}
+					}
+
+				}
+
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return queryWrapper;
+
+	}
+
+	public static String setMethod(String filedName) {
+		String alpha = filedName.substring(0, 1).toUpperCase();
+		String methodName = "set" + alpha + filedName.substring(1);
+		return methodName;
+	}
+
+	public static String getMethod(String filedName) {
+		String alpha = filedName.substring(0, 1).toUpperCase();
+		String methodName = "get" + alpha + filedName.substring(1);
+		return methodName;
+	}
+
+	/**
+	 * 获取属性名
+	 *
+	 * @exception/throws
+	 */
+//	private static String getFieldValue(Object owner, String fieldName) {
+//		try {
+//			return invokeMethod(owner, fieldName, null).toString();
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//		return null;
+//	}
+
+	public static void main(String[] args) {
+//		ContractOrderEntity cc = new ContractOrderEntity();
+		// cc.setStartDatea("fdsafdsa");
+//		convertQuery(cc);
+
+//		Method m = ReflectionUtils.findMethod(ContractOrderEntity.class, "f");
+//		System.out.println(m);
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/service/ArchivesService.java

@@ -0,0 +1,27 @@
+package me.zhengjie.archives.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import me.zhengjie.archives.entity.ArchivesEntity;
+import me.zhengjie.archives.plus.AbstractService;
+import me.zhengjie.archives.vo.ArchivesVo;
+import me.zhengjie.archives.vo.CasePortraitVo;
+import me.zhengjie.archives.vo.PageResultVo;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author <a href="https://www.fengwenyi.com?code">Erwin Feng</a>
+ * @since 2023-04-18
+ */
+public interface ArchivesService extends AbstractService<ArchivesEntity> {
+	public Map<String, Object> page(ArchivesVo req);
+
+	public void mergeSubmit(CasePortraitVo archives) throws Exception;
+}

eladmin-system/src/main/java/me/zhengjie/archives/service/FileInfoService.java

@@ -0,0 +1,39 @@
+package me.zhengjie.archives.service;
+
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson.JSONObject;
+
+import me.zhengjie.archives.dto.FilePreviewDto;
+import me.zhengjie.archives.entity.FileInfoEntity;
+import me.zhengjie.archives.plus.AbstractService;
+import me.zhengjie.archives.vo.FileUploadVO;
+
+/**
+ * <p>
+ * 文件上传记录表 服务类
+ * </p>
+ *
+ * @author humuyu
+ * @since 2022-03-10
+ */
+public interface FileInfoService extends AbstractService<FileInfoEntity> {
+
+	/**
+	 * 查询所有路径
+	 *
+	 * @param idList 主键ID列表
+	 */
+	public List<FilePreviewDto> getFilePath(MultipartFile[] files);
+	/**
+	 * 查询所有路径
+	 *
+	 * @param idList 主键ID列表
+	 */
+	public List<FilePreviewDto> getFilePath(List<String> files);
+	JSONObject saveFile(FileUploadVO file);
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/service/impl/ArchivesServiceImpl.java

@@ -0,0 +1,245 @@
+package me.zhengjie.archives.service.impl;
+
+import java.io.File;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import me.zhengjie.archives.dao.IArchivesDao;
+import me.zhengjie.archives.dao.IModelDao;
+import me.zhengjie.archives.entity.ArchivesEntity;
+import me.zhengjie.archives.entity.FileInfoEntity;
+import me.zhengjie.archives.entity.ModelEntity;
+import me.zhengjie.archives.plus.AbstractServiceImpl;
+import me.zhengjie.archives.service.ArchivesService;
+import me.zhengjie.archives.service.FileInfoService;
+import me.zhengjie.archives.util.HtmlConvertPdf;
+import me.zhengjie.archives.util.HtmlConvertToPdf;
+import me.zhengjie.archives.util.HtmlToImage;
+import me.zhengjie.archives.util.PdfUtils;
+import me.zhengjie.archives.vo.ArchivesVo;
+import me.zhengjie.archives.vo.CasePortraitVo;
+import me.zhengjie.base.ResponseDTO;
+import me.zhengjie.config.FileProperties;
+import me.zhengjie.modules.system.service.DictDetailService;
+import me.zhengjie.utils.BeanCopyUtils;
+import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.UUIDGenerator;
+
+@Service
+public class ArchivesServiceImpl extends AbstractServiceImpl<IArchivesDao, ArchivesEntity> implements ArchivesService {
+	@Autowired
+	IModelDao modelDao;
+	@Autowired
+	private FileProperties properties;
+	@Autowired
+	private FileInfoService fileInfoService;
+	@Autowired
+	DictDetailService dictDetailService;
+	@Autowired
+	HtmlConvertToPdf htmlConvertToPdf;
+
+	public Map<String, Object> page(ArchivesVo req) {
+		IPage<ArchivesEntity> page = new Page<>(req.getIndex(), req.getSize());
+		ArchivesEntity entity = BeanCopyUtils.convertObj(req, ArchivesEntity.class);
+		entity.setIsDelete("1");
+		page = page(page, entity);
+		String previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
+
+		for (ArchivesEntity archive : page.getRecords()) {
+			if (StringUtils.isNotBlank(archive.getPdfPath()))
+				archive.setPdfPath(previewPath + archive.getPdfPath());
+		}
+		return PageUtil.toPage(page.getRecords(), page.getTotal());
+
+	}
+
+	public void pdf(CasePortraitVo archives) throws Exception {
+
+		QueryWrapper<ModelEntity> queryWrapper = new QueryWrapper<ModelEntity>();
+		// 这个是目录的
+		queryWrapper.eq("code", 1);
+		ModelEntity model = modelDao.selectOne(queryWrapper);
+		String path = properties.getPath().getPath();
+		String fileRelatePath = FileUtil.getUploadPath(path);
+		String filePath = path + fileRelatePath;
+		String pageHtml = model.getContent();
+		
+		ArchivesEntity archive=this.getById(archives.getId());
+		
+		pageHtml.replace("{{notarialNum}}", archive.getNotarialNum());
+		pageHtml.replace("{{notarizedItem}}", archive.getNotarizedItem());
+		pageHtml.replace("{{partyName}}", archive.getPartyName());
+		pageHtml.replace("{{undertaker}}", archive.getUndertaker());
+		pageHtml.replace("{{notary}}", archive.getNotary());
+		pageHtml.replace("{{acceptDate}}", archive.getAcceptDate());
+		pageHtml.replace("{{completeDate}}", archive.getCompleteDate());
+		pageHtml.replace("{{filingDate}}", archive.getFilingDate());
+		pageHtml.replace("{{saveTerm}}", archive.getSaveTerm());
+		pageHtml.replace("{{dossierNum}}", archive.getDossierNum());
+		pageHtml.replace("{{acceptNum}}", archive.getAcceptNum());
+		pageHtml.replace("{{fondsNum}}", archive.getFondsNum());
+		pageHtml.replace("{{catalogNum}}", archive.getCatalogNum());
+		pageHtml.replace("{{caseNum}}", archive.getCaseNum());
+		String pagePdf = filePath + UUIDGenerator.uuid() + ".pdf";
+		htmlConvertToPdf.converPdf(pageHtml, pagePdf);
+//		List<String> pages = archives.getPages();
+//		for (int i = 0; i < pages.size(); i++) {
+//			pageHtml = pageHtml.replace("${num" + j + "}", pages.get(i));
+//		}
+
+		queryWrapper = new QueryWrapper<ModelEntity>();
+		// 这个是目录的
+		queryWrapper.eq("code", 2);
+		model = modelDao.selectOne(queryWrapper);
+
+		String catalogHtml = model.getContent();
+		int j = 0;
+		List<String> pages = archives.getPages();
+		for (int i = 0; i < pages.size(); i++) {
+			j = i + 1;
+			catalogHtml = catalogHtml.replace("${num" + j + "}", pages.get(i));
+		}
+
+		// String htmlPath = filePath + UUIDGenerator.uuid() + ".html";
+		// String htmlToImage = filePath + UUIDGenerator.uuid() + ".jpg";
+		// 先写入文本
+		// FileUtil.writeUtf8String(html, htmlPath);
+		// HtmlConvertPdf.createPdfFile(html, htmlToPdf);
+		List<String> imageIds = archives.getImageIds();
+		List<FileInfoEntity> fileInfos = fileInfoService.listByIds(imageIds);
+		Map<String, String> map = new HashMap<String, String>();
+		for (FileInfoEntity fileInfo : fileInfos) {
+			map.put(fileInfo.getId(), fileInfo.getPath());
+		}
+		List<File> files = new ArrayList<File>();
+
+		for (String str : imageIds) {
+			files.add(new File(path + map.get(str)));
+		}
+
+		String fileName = "merge_pdf" + UUIDGenerator.uuid() + ".pdf";
+		String toPdfTarget = filePath + fileName;
+		// pdf进行合并
+		PdfUtils.manyImageToOnePdf(files, toPdfTarget);
+		// 合并pdf
+		List<String> sourcesList = new ArrayList<>();
+		// 封面放在第一位
+		// sourcesList.add(new File(htmlToImage));
+		sourcesList.add(pagePdf);
+		// 封面放在页码第二位
+		String catalogPdf = filePath + UUIDGenerator.uuid() + ".pdf";
+		htmlConvertToPdf.converPdf(catalogHtml, catalogPdf);
+		sourcesList.add(catalogPdf);
+		// 第三部分是内容
+		sourcesList.add(toPdfTarget);
+		// ---------------------------
+		fileName = "merge_" + UUIDGenerator.uuid() + ".pdf";
+		String dstPath = filePath + fileName;
+
+		PdfUtils.mergePdf(sourcesList, dstPath);
+		ArchivesEntity archiveEntity = new ArchivesEntity();
+		archiveEntity.setId(archives.getId());
+		archiveEntity.setPdfPath(fileRelatePath + fileName);
+		archiveEntity.setStatus("1");
+		this.updateById(archiveEntity);
+
+	}
+
+	public void image(CasePortraitVo archives) throws Exception {
+
+		QueryWrapper<ModelEntity> queryWrapper = new QueryWrapper<ModelEntity>();
+		queryWrapper.eq("code", 1);
+		ModelEntity model = modelDao.selectOne(queryWrapper);
+		String path = properties.getPath().getPath();
+		String fileRelatePath = FileUtil.getUploadPath(path);
+		String filePath = path + fileRelatePath;
+		String html = model.getContent();
+		int j = 0;
+		List<String> pages = archives.getPages();
+		for (int i = 0; i < pages.size(); i++) {
+			j = i + 1;
+			html = html.replace("${num" + j + "}", pages.get(i));
+		}
+
+		String htmlPath = filePath + UUIDGenerator.uuid() + ".html";
+		String htmlToImage = filePath + UUIDGenerator.uuid() + ".jpg";
+		// 先写入文本
+		FileUtil.writeUtf8String(html, htmlPath);
+		// 然后生成jpg
+		String exePath = dictDetailService.getValueByName("file_path").get("exe_path");
+		HtmlToImage.htmlToImg(exePath, htmlPath, htmlToImage);
+		// HtmlConvertPdf.createPdfFile(html, htmlToPdf);
+		List<String> imageIds = archives.getImageIds();
+		List<FileInfoEntity> fileInfos = fileInfoService.listByIds(imageIds);
+		Map<String, String> map = new HashMap<String, String>();
+		for (FileInfoEntity fileInfo : fileInfos) {
+			map.put(fileInfo.getId(), fileInfo.getPath());
+		}
+		List<File> files = new ArrayList<File>();
+		// 封面放在第一位
+		files.add(new File(htmlToImage));
+		for (String str : imageIds) {
+			files.add(new File(path + map.get(str)));
+		}
+
+		String fileName = "merge_pdf" + UUIDGenerator.uuid() + ".pdf";
+		String toPdfTarget = filePath + fileName;
+		// pdf进行合并
+		PdfUtils.manyImageToOnePdf(files, toPdfTarget);
+//		List<String> sourcesList = new ArrayList<>();
+
+//		fileName = "merge_" + UUIDGenerator.uuid() + ".pdf";
+//		String dstPath = filePath + fileName;
+		// 一个是封面
+//		sourcesList.add(htmlToPdf);	
+//		sourcesList.add(toPdfTarget);
+//		PdfUtils.mergePdf(sourcesList, dstPath)
+		ArchivesEntity archiveEntity = new ArchivesEntity();
+		archiveEntity.setId(archives.getId());
+		archiveEntity.setPdfPath(fileRelatePath + fileName);
+		archiveEntity.setStatus("1");
+		this.updateById(archiveEntity);
+
+	}
+	public void print(CasePortraitVo archives) throws Exception {
+		String path = properties.getPath().getPath();
+		String fileRelatePath = FileUtil.getUploadPath(path);
+		String filePath = path + fileRelatePath;
+
+		List<String> imageIds = archives.getImageIds();
+		List<FileInfoEntity> fileInfos = fileInfoService.listByIds(imageIds);
+		Map<String, String> map = new HashMap<String, String>();
+		for (FileInfoEntity fileInfo : fileInfos) {
+			map.put(fileInfo.getId(), fileInfo.getPath());
+		}
+		List<File> files = new ArrayList<File>();
+		for (String str : imageIds) {
+			files.add(new File(path + map.get(str)));
+		}
+		String fileName = "merge_pdf" + UUIDGenerator.uuid() + ".pdf";
+		String toPdfTarget = filePath + fileName;
+		// pdf进行合并
+		PdfUtils.manyImageToOnePdf(files, toPdfTarget);
+		ArchivesEntity archiveEntity = new ArchivesEntity();
+		archiveEntity.setId(archives.getId());
+		archiveEntity.setPdfPath(fileRelatePath + fileName);
+		archiveEntity.setStatus("1");
+		this.updateById(archiveEntity);
+
+	}
+	public void mergeSubmit(CasePortraitVo archives) throws Exception {
+		print(archives);
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/service/impl/FileInfoServiceImpl.java

@@ -0,0 +1,109 @@
+package me.zhengjie.archives.service.impl;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import me.zhengjie.archives.dao.IFileInfoDao;
+import me.zhengjie.archives.dto.FilePreviewDto;
+import me.zhengjie.archives.entity.FileInfoEntity;
+import me.zhengjie.archives.plus.AbstractServiceImpl;
+import me.zhengjie.archives.service.FileInfoService;
+import me.zhengjie.archives.vo.FileUploadVO;
+import me.zhengjie.config.FileProperties;
+import me.zhengjie.modules.system.service.DictDetailService;
+import me.zhengjie.utils.FileUtil;
+import me.zhengjie.utils.UUIDGenerator;
+
+/**
+ * <p>
+ * 文件上传记录表 服务实现类
+ * </p>
+ *
+ * @author humuyu
+ * @since 2022-03-10
+ */
+@Service
+public class FileInfoServiceImpl extends AbstractServiceImpl<IFileInfoDao, FileInfoEntity> implements FileInfoService {
+	@Autowired
+	private FileProperties properties;
+	// @Value("${previewPath}")
+	private String previewPath;
+	@Autowired
+	DictDetailService dictDetailService;
+
+	@Override
+	public List<FilePreviewDto> getFilePath(MultipartFile[] files) {
+
+		previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
+
+		List<FilePreviewDto> previews = new ArrayList<>();
+
+		String path = properties.getPath().getPath();
+		String filePath = FileUtil.getUploadPath(path);
+		List<FileInfoEntity> fileInfo = new ArrayList<FileInfoEntity>();
+		for (int i = 0; i < files.length; i++) {
+			FilePreviewDto filePreviewDto = new FilePreviewDto();
+			FileInfoEntity entity = new FileInfoEntity();
+			String fileName = FileUtil.uploadFile(files[i], path + filePath);
+			entity.setId(UUIDGenerator.getIdNo());
+			entity.setPath(filePath + fileName);
+			entity.setFileName(fileName);
+			entity.setCreateTime(LocalDateTime.now());
+			entity.setUpdateTime(LocalDateTime.now());
+			filePreviewDto.setFileId(entity.getId());
+			filePreviewDto.setFileUrl(previewPath + entity.getPath());
+			previews.add(filePreviewDto);
+			fileInfo.add(entity);
+		}
+		this.saveBatch(fileInfo);
+		// 图片预览地址
+		return previews;
+	}
+
+	@Override
+	public JSONObject saveFile(FileUploadVO file) {
+
+		return null;
+	}
+
+	@Override
+	public List<FilePreviewDto> getFilePath(List<String> files) {
+
+		previewPath = dictDetailService.getValueByName("file_path").get("preview_path");
+
+		List<FilePreviewDto> previews = new ArrayList<>();
+		String path = properties.getPath().getPath();
+		String filePath = FileUtil.getUploadPath(path);
+		List<FileInfoEntity> fileInfo = new ArrayList<FileInfoEntity>();
+		for (int i = 0; i < files.size(); i++) {
+			FilePreviewDto filePreviewDto = new FilePreviewDto();
+			FileInfoEntity entity = new FileInfoEntity();
+			byte[] fileBtye = Base64.decodeBase64(files.get(i));
+			String fileName = FileUtil.uploadFile(fileBtye, path + filePath);
+			entity.setId(UUIDGenerator.getIdNo());
+			entity.setPath(filePath + fileName);
+			entity.setFileName(fileName);
+			entity.setCreateTime(LocalDateTime.now());
+			entity.setUpdateTime(LocalDateTime.now());
+			filePreviewDto.setFileId(entity.getId());
+			filePreviewDto.setFileUrl(previewPath + entity.getPath());
+			previews.add(filePreviewDto);
+			fileInfo.add(entity);
+		}
+		this.saveBatch(fileInfo);
+		// 图片预览地址
+		return previews;
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/util/HtmlConvertPdf.java

@@ -0,0 +1,144 @@
+package me.zhengjie.archives.util;
+
+import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.AppRun;
+import me.zhengjie.utils.FileUtil;
+
+import org.apache.commons.io.FileUtils;
+
+import java.awt.*;
+import java.io.*;
+import java.nio.charset.Charset;
+import java.util.UUID;
+
+/**
+ * https://pd4ml.com/api/org/zefer/pd4ml/PD4ML.html api文档
+ * 
+ * 生成PDF文件的工具类
+ * 
+ * @author humuyu
+ * 
+ */
+@Slf4j
+public class HtmlConvertPdf {
+
+	private static int width = 1642;
+	private static int height = 650;
+
+	/**
+	 * 获取PDF的宽度
+	 * 
+	 * @return
+	 */
+	public int getWidth() {
+		return width;
+	}
+
+	/**
+	 * 设置PDF的宽度
+	 * 
+	 * @return
+	 */
+	public void setWidth(int width) {
+		HtmlConvertPdf.width = width;
+	}
+
+	/**
+	 * 获取PDF的高度
+	 * 
+	 * @return
+	 */
+	public int getHeight() {
+		return height;
+	}
+	//wkhtmltoimage  www.bing.com bing2.png
+    //@Override
+    public boolean htmlToImg(String srcPath, String destPath) {
+        try {
+            File file = new File(destPath);
+            File parent = file.getParentFile();
+            //如果pdf保存路径不存在，则创建路径
+            if (!parent.exists()) {
+                parent.mkdirs();
+            }
+            StringBuilder cmd = new StringBuilder();
+            if (System.getProperty("os.name").indexOf("Windows") == -1) {
+                //非windows 系统
+                //toPdfTool = "/home/ubuntu/wkhtmltox/bin/wkhtmltopdf";
+            }
+           // cmd.append(toImgTool);
+            cmd.append(" ");
+            //cmd.append("--crop-w 400 --width 1680 --quality 50 ");
+            cmd.append(srcPath);
+            cmd.append(" ");
+            cmd.append(destPath);
+
+            Process proc = Runtime.getRuntime().exec(cmd.toString());
+//            HtmlToXInterceptor error = new HtmlToXInterceptor(proc.getErrorStream());
+//            HtmlToXInterceptor output = new HtmlToXInterceptor(proc.getInputStream());
+//            error.start();
+//            output.start();
+            proc.waitFor();
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+	/**
+	 * 设置PDF的高度
+	 * 
+	 * @return
+	 */
+	public void setHeight(int height) {
+		HtmlConvertPdf.height = height;
+	}
+
+	/**
+	 * 创建PDF文件
+	 * 
+	 * @param html    html字符串
+	 * @param desPath 输出的PDF文件路径
+	 * @throws Exception
+	 */
+	public static void createPdfFile(String html, String desPath) throws Exception {}
+
+	/**
+	 * 读取文件路径
+	 * 
+	 * @param path     路径
+	 * @param encoding 编码
+	 * @return string
+	 * @throws IOException
+	 */
+	public String readFile(String path, String encoding) throws IOException {
+
+		FileInputStream is = new FileInputStream(path);
+		BufferedInputStream bis = new BufferedInputStream(is);
+		ByteArrayOutputStream fos = new ByteArrayOutputStream();
+		byte[] buffer = new byte[2048];
+		int read;
+		do {
+			read = is.read(buffer, 0, buffer.length);
+			if (read > 0) {
+				fos.write(buffer, 0, read);
+			}
+		} while (read > -1);
+
+		fos.close();
+		bis.close();
+		is.close();
+
+		return fos.toString(encoding);
+	}
+
+	public static void main(String[] args) throws Exception {
+
+
+//		String html=;
+//		createPdfFile(html, "D:\\data\\aa.pdf");
+//		String str = "jcapi";
+//		System.loadLibrary(str);
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/util/HtmlConvertToPdf.java

@@ -0,0 +1,130 @@
+package me.zhengjie.archives.util;
+
+import com.openhtmltopdf.outputdevice.helper.BaseRendererBuilder;
+import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
+import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.utils.FileUtil;
+import org.apache.commons.io.FileUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.helper.W3CDom;
+import org.jsoup.nodes.Document;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import java.awt.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.nio.file.*;
+
+/**
+ * https://pd4ml.com/api/org/zefer/pd4ml/PD4ML.html api文档
+ * 
+ * 生成PDF文件的工具类
+ * 
+ * @author humuyu
+ * 
+ */
+@Component
+@Slf4j
+public class HtmlConvertToPdf implements InitializingBean {
+	@Value("${html2Pdf.simsumPath}")
+	private String simsumPath;
+	@Value("${html2Pdf.simfangPath}")
+	private String simfangPath;
+
+
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		String[] fontPath = { simsumPath, simfangPath };
+		for (String path : fontPath) {
+			String aimPath = path.substring(path.indexOf("/"));
+			Path temp = Paths
+					.get(new File(HtmlConvertToPdf.class.getClassLoader().getResource("").getPath().concat(aimPath))
+							.getAbsolutePath());
+			if (Files.exists(temp)) {
+				Files.delete(temp);
+			}
+			Files.copy(HtmlConvertToPdf.class.getClassLoader().getResourceAsStream(path), temp,
+					StandardCopyOption.REPLACE_EXISTING);
+		}
+	}
+
+	/**
+	 * 将html转换成pdf
+	 *
+	 * @param html
+	 * @param destPath
+	 * @throws Exception
+	 */
+	public void converPdf(String html, String destPath) throws Exception {
+
+		convertPdfWithOpenPDF(html, destPath);
+
+	}
+
+	/**
+	 * 使用OpenPDF将html转换成pdf
+	 *
+	 * @param html
+	 * @param destPath
+	 * @throws Exception
+	 */
+	private void convertPdfWithOpenPDF(String html, String destPath) throws Exception {
+		// 加载html文件
+		Document document = Jsoup.parse(html);
+		document.outputSettings().syntax(Document.OutputSettings.Syntax.html);
+		// 引入资源目录，可以单独引入css，图片文件等
+		String baseUri = FileSystems.getDefault().getPath("eladmin-system/src/main/resources/css").toUri().toString();
+		//
+		File file = new File(destPath);
+		FileUtils.writeStringToFile(file, "", "UTF-8");
+		OutputStream os = new FileOutputStream(file);
+		PdfRendererBuilder builder = new PdfRendererBuilder();
+		builder.withUri(destPath);
+		builder.toStream(os);
+		builder.withW3cDocument(new W3CDom().fromJsoup(document), baseUri);
+		builder.addDOMMutator(doc -> {
+			Element style = doc.createElement("style");
+			Node node = doc.createTextNode("@page { margin-top: 90px; margin-bottom: 90px; }");
+			style.appendChild(node);
+			doc.getElementsByTagName("head").item(0).appendChild(style);
+		});
+
+		// 引入指定字体，注意字体名需要和css样式中指定的字体名相同
+		String fontPath = HtmlConvertToPdf.class.getClassLoader().getResource("").getPath();
+		System.out.println(fontPath);
+		builder.useFont(new File(fontPath + simsumPath.substring(simsumPath.indexOf("/") + 1)), "SimSun", 400,
+				BaseRendererBuilder.FontStyle.NORMAL, true);
+		builder.useFont(new File(fontPath + simfangPath.substring(simfangPath.indexOf("/") + 1)), "simfang", 400,
+				BaseRendererBuilder.FontStyle.NORMAL, true);
+
+		builder.run();
+	}
+
+	public static void main(String[] args) {
+		try {
+			HtmlConvertToPdf htmlConvertToPdf = new HtmlConvertToPdf();
+			htmlConvertToPdf.setSimsumPath("/font/simsun.ttf");
+			htmlConvertToPdf.setSimfangPath("/font/simfang.ttf");
+			htmlConvertToPdf.convertPdfWithOpenPDF(
+					FileUtil.readUtf8String("/Users/sakuya/Downloads/9e88124747724a17996afeda61dbb758.html"),
+					"/Users/sakuya/Downloads/a44a021e9a0d473092fd051c48b3d36b.pdf");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void setSimsumPath(String simsumPath) {
+		this.simsumPath = simsumPath;
+	}
+
+	public void setSimfangPath(String simfangPath) {
+		this.simfangPath = simfangPath;
+	}
+}

eladmin-system/src/main/java/me/zhengjie/archives/util/HtmlToImage.java

@@ -0,0 +1,75 @@
+package me.zhengjie.archives.util;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
+
+public class HtmlToImage {
+
+	// wkhtmltoimage www.bing.com bing2.png
+	// @Override
+	public static boolean htmlToImg(String exePath, String srcPath, String destPath) {
+		try {
+			File file = new File(destPath);
+			File parent = file.getParentFile();
+			// 如果pdf保存路径不存在，则创建路径
+			if (!parent.exists()) {
+				parent.mkdirs();
+			}
+			StringBuilder cmd = new StringBuilder();
+			if (System.getProperty("os.name").indexOf("Windows") == -1) {
+				// 非windows 系统
+				// toPdfTool = "/home/ubuntu/wkhtmltox/bin/wkhtmltopdf";
+			}
+			cmd.append(exePath);
+			cmd.append(" ");
+			// cmd.append("--crop-w 400 --width 1680 --quality 50 ");
+			cmd.append("--width 820  --height 1168  ");
+			cmd.append(srcPath);
+			cmd.append(" ");
+			cmd.append(destPath);
+			Process proc = Runtime.getRuntime().exec(cmd.toString());
+//			HtmlToXInterceptor error = new HtmlToXInterceptor(proc.getErrorStream());
+//			HtmlToXInterceptor output = new HtmlToXInterceptor(proc.getInputStream());
+//			error.start();
+//			output.start();
+			proc.waitFor();
+			return true;
+		} catch (Exception e) {
+			e.printStackTrace();
+			return false;
+		}
+	}
+
+	public void show() {
+		ProcessBuilder pb = new ProcessBuilder("D:\\Program Files\\wkhtmltopdf\\wkhtmltoimage", "www.baidu.com",
+				"D:\\test.jpg");
+		Process process;
+		try {
+			process = pb.start();
+			BufferedReader errStreamReader = new BufferedReader(new InputStreamReader(process.getErrorStream()));
+			System.out.println("read errstreamreader");
+			String line = null;
+			line = errStreamReader.readLine();
+			while (line != null) {
+				System.out.println(line);
+				line = errStreamReader.readLine();
+
+			}
+			process.destroy();
+
+			System.out.println("destroyed process");
+
+		} catch (Exception e) {
+
+			e.printStackTrace();
+
+		}
+
+	}
+
+	public static void main(String[] args) {
+		htmlToImg("", "D:\\data\\index.html", "D:\\data\\cc.jpg");
+	}
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/util/PdfUtils.java

@@ -0,0 +1,109 @@
+package me.zhengjie.archives.util;
+
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.imageio.ImageIO;
+
+import org.apache.pdfbox.io.MemoryUsageSetting;
+import org.apache.pdfbox.multipdf.PDFMergerUtility;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
+import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+
+import me.zhengjie.utils.FileUtil;
+
+public class PdfUtils {
+	public static void mergePdf(List<String> sourcesList, String dstName) throws Exception {
+		PDFMergerUtility mergePdf = new PDFMergerUtility();
+		for (String file : sourcesList) {
+			mergePdf.addSource(file);
+		}
+		byte[] b = null;
+		OutputStream outStream = null;
+		ByteArrayOutputStream bos = null;
+		try {
+			bos = new ByteArrayOutputStream();
+			mergePdf.setDestinationStream(bos);
+			outStream = mergePdf.getDestinationStream();
+			bos = (ByteArrayOutputStream) outStream;
+			mergePdf.mergeDocuments(MemoryUsageSetting.setupTempFileOnly());
+			b = bos.toByteArray();
+		} finally {
+			outStream.close();
+			bos.close();
+		}
+		FileUtil.writeBytes(b, dstName);
+
+	}
+
+	/**
+	 * 多图片合成pdf的限制后缀
+	 */
+	private static final List<String> IMAGE_SUFFIX = Arrays.asList("jpg", "png", "jpeg");
+
+	/**
+	 * 多个图片合成一个pdf
+	 *
+	 * @param imgFolder 多图片的文件夹路径 例如:"D:\\image\\"
+	 * @param target    合并的图片路径 "D:\\image\\merge.pdf"
+	 * @throws IOException
+	 */
+	public static void manyImageToOnePdf(List<File> files, String target) throws Exception {
+		PDDocument doc = new PDDocument();
+		// 创建一个空的pdf文件
+
+		PDPage page;
+		PDImageXObject pdImage;
+		PDPageContentStream contents;
+		BufferedImage bufferedImage;
+		String fileName;
+		float w, h;
+		String suffix;
+		File tempFile;
+		int index;
+
+		for (int i = 0; i < files.size(); i++) {
+			tempFile = files.get(i);
+			if (!tempFile.isFile()) {
+				continue;
+			}
+
+			fileName = tempFile.getName();
+			index = fileName.lastIndexOf(".");
+			if (index == -1) {
+				continue;
+			}
+			// 获取文件的后缀
+			suffix = fileName.substring(index + 1);
+			// 如果文件后缀不是图片格式,跳过当前循环
+			if (!IMAGE_SUFFIX.contains(suffix)) {
+				continue;
+			}
+
+			bufferedImage = ImageIO.read(tempFile);
+			// Retrieving the page
+			pdImage = LosslessFactory.createFromImage(doc, bufferedImage);
+			w = pdImage.getWidth();
+			h = pdImage.getHeight();
+			page = new PDPage(new PDRectangle(w, h));
+			contents = new PDPageContentStream(doc, page);
+			contents.drawImage(pdImage, 0, 0, w, h);
+			System.out.println("Image inserted");
+			contents.close();
+			doc.addPage(page);
+		}
+		// 保存pdf
+		doc.save(target);
+		// 关闭pdf
+		doc.close();
+	}
+
+}

eladmin-system/src/main/java/me/zhengjie/archives/vo/ArchivesVo.java

@@ -0,0 +1,21 @@
+package me.zhengjie.archives.vo;
+
+import java.util.List;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class ArchivesVo extends PageVo {
+	// 档案号
+	private String archivesNum;
+	// 案卷号
+	private String caseNum;
+	// 当事人姓名
+	private String partyName;
+	//主键
+	private Long id;
+}

eladmin-system/src/main/java/me/zhengjie/archives/vo/CasePortraitVo.java

@@ -0,0 +1,24 @@
+package me.zhengjie.archives.vo;
+
+import java.util.List;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 案卷影像提交
+ * 
+ * @author auas
+ *
+ */
+@Getter
+@Setter
+@ToString
+public class CasePortraitVo {
+	private Long id;
+	private List<String> pages;
+	private List<String> imageIds;
+}

eladmin-system/src/main/java/me/zhengjie/archives/vo/FileUploadVO.java

@@ -0,0 +1,28 @@
+package me.zhengjie.archives.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+ * 上传图片
+ * 
+ * @author auas
+ *
+ */
+@Getter
+@Setter
+@ToString
+public class FileUploadVO {
+
+	private List<MultipartFile> fileUpload;
+	private List<String> files;
+	
+}

eladmin-system/src/main/java/me/zhengjie/archives/vo/PageResultVo.java

@@ -0,0 +1,35 @@
+package me.zhengjie.archives.vo;
+
+
+import lombok.Data;
+
+
+/**
+ * @Name: ResultData
+ * @Author: UncleDong
+ * @Date: 2020-10-25
+ * @Description:
+ */
+@Data
+public class PageResultVo<T> {
+
+    /**
+     * 结果集
+     */
+    private T result;
+
+    /**
+     * 分页信息
+     */
+    private PageVo page;
+
+
+    public PageResultVo(T result) {
+        this.result = result;
+    }
+
+    public PageResultVo(T result, PageVo page) {
+        this.result = result;
+        this.page = page;
+    }
+}

eladmin-system/src/main/java/me/zhengjie/archives/vo/PageVo.java

@@ -0,0 +1,56 @@
+package me.zhengjie.archives.vo;
+
+/**
+ * @Name: BaseRequest
+ * @Author: UncleDong
+ * @Date: 2020-10-26
+ * @Description: 请求参数基础类
+ */
+
+public class PageVo {
+	public PageVo() {
+
+	}
+
+	public PageVo(Integer index, Integer size, Integer total) {
+		this.index = index;
+		this.size = size;
+		this.total = total;
+	}
+
+	/**
+	 * 第几页
+	 */
+	protected Integer index;
+
+	/**
+	 * 每页多少条数据
+	 */
+	protected Integer size;
+
+	protected Integer total;
+
+	public Integer getSize() {
+		return size == null ? 10 : size;
+	}
+
+	public void setIndex(Integer index) {
+		this.index = index;
+	}
+
+	public void setSize(Integer size) {
+		this.size = size;
+	}
+
+	public void setTotal(Integer total) {
+		this.total = total;
+	}
+
+	public Integer getTotal() {
+		return total;
+	}
+
+	public Integer getIndex() {
+		return index == null ? 1 : index;
+	}
+}

eladmin-system/src/main/java/me/zhengjie/config/MybatisPlusConfig.java

@@ -0,0 +1,27 @@
+package me.zhengjie.config;
+
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static com.baomidou.mybatisplus.annotation.DbType.MYSQL;
+/**
+ * @author SONG
+ * @version 0.1.0
+ * @company NJCOOL
+ * @date 2022/3/29
+ */
+@Configuration
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor paginationInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        interceptor.addInnerInterceptor(paginationInnerInterceptor);
+        return interceptor;
+    }
+
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/system/rest/FileInfoController.java

@@ -1,20 +0,0 @@
-package me.zhengjie.modules.system.rest;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import io.swagger.annotations.Api;
-import lombok.RequiredArgsConstructor;
-import me.zhengjie.modules.system.service.DictDetailService;
-
-/**
-* @author Zheng Jie
-* @date 2019-04-10
-*/
-@RestController
-@RequiredArgsConstructor
-@Api(tags = "系统：字典详情管理")
-@RequestMapping("/api/dictDetail")
-public class FileInfoController {
-
-}

eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java

@@ -60,4 +60,8 @@ public interface DictDetailService {
      * @return /
      */
     List<DictDetailDto> getDictByName(String name);
+    
+	public Map<String, String> getValueByName(String name);
+	public String getLabelValue(String name,String key) ;
+    
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DataServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.*;
  **/
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "data")
+//@CacheConfig(cacheNames = "data")
 public class DataServiceImpl implements DataService {
 
     private final RoleService roleService;
@@ -48,7 +48,7 @@ public class DataServiceImpl implements DataService {
      * @return /
      */
     @Override
-    @Cacheable(key = "'user:' + #p0.id")
+   // @Cacheable(key = "'user:' + #p0.id")
     public List<Long> getDeptIds(UserDto user) {
         // 用于存储部门id
         Set<Long> deptIds = new HashSet<>();

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DeptServiceImpl.java

@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "dept")
+//@CacheConfig(cacheNames = "dept")
 public class DeptServiceImpl implements DeptService {
 
     private final DeptRepository deptRepository;
@@ -88,7 +88,7 @@ public class DeptServiceImpl implements DeptService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+  //  @Cacheable(key = "'id:' + #p0")
     public DeptDto findById(Long id) {
         Dept dept = deptRepository.findById(id).orElseGet(Dept::new);
         ValidationUtil.isNull(dept.getId(),"Dept","id",id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java

@@ -31,6 +31,8 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -40,7 +42,7 @@ import java.util.Map;
 */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "dict")
+//@CacheConfig(cacheNames = "dict")
 public class DictDetailServiceImpl implements DictDetailService {
 
     private final DictRepository dictRepository;
@@ -74,7 +76,7 @@ public class DictDetailServiceImpl implements DictDetailService {
     }
 
     @Override
-    @Cacheable(key = "'name:' + #p0")
+    // @Cacheable(key = "'name:' + #p0")
     public List<DictDetailDto> getDictByName(String name) {
         return dictDetailMapper.toDto(dictDetailRepository.findByDictName(name));
     }
@@ -92,4 +94,19 @@ public class DictDetailServiceImpl implements DictDetailService {
         Dict dict = dictRepository.findById(dictDetail.getDict().getId()).orElseGet(Dict::new);
         redisUtils.del(CacheKey.DICT_NAME + dict.getName());
     }
+	public Map<String, String> getValueByName(String name) {
+		List<DictDetailDto> dicts = getDictByName(name);
+		Map<String, String> map = new HashMap<>();
+		for (DictDetailDto dict : dicts) {
+			map.put(dict.getLabel(), dict.getValue());
+		}
+		return map;
+	}
+	public String getLabelValue(String name,String key) {
+	
+		 
+		return getValueByName(name).get(key);
+	}
+    
+    
 }

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java

@@ -40,7 +40,7 @@ import java.util.*;
 */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "dict")
+//@CacheConfig(cacheNames = "dict")
 public class DictServiceImpl implements DictService {
 
     private final DictRepository dictRepository;

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java

@@ -43,7 +43,7 @@ import java.util.*;
 */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "job")
+//@CacheConfig(cacheNames = "job")
 public class JobServiceImpl implements JobService {
 
     private final JobRepository jobRepository;
@@ -64,7 +64,7 @@ public class JobServiceImpl implements JobService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //@Cacheable(key = "'id:' + #p0")
     public JobDto findById(Long id) {
         Job job = jobRepository.findById(id).orElseGet(Job::new);
         ValidationUtil.isNull(job.getId(),"Job","id",id);

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java

@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "menu")
+//@CacheConfig(cacheNames = "menu")
 public class MenuServiceImpl implements MenuService {
 
     private final MenuRepository menuRepository;
@@ -88,7 +88,7 @@ public class MenuServiceImpl implements MenuService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    //  @Cacheable(key = "'id:' + #p0")
     public MenuDto findById(long id) {
         Menu menu = menuRepository.findById(id).orElseGet(Menu::new);
         ValidationUtil.isNull(menu.getId(),"Menu","id",id);
@@ -101,7 +101,7 @@ public class MenuServiceImpl implements MenuService {
      * @return /
      */
     @Override
-    @Cacheable(key = "'user:' + #p0")
+    //@Cacheable(key = "'user:' + #p0")
     public List<MenuDto> findByUser(Long currentUserId) {
         List<RoleSmallDto> roles = roleService.findByUsersId(currentUserId);
         Set<Long> roleIds = roles.stream().map(RoleSmallDto::getId).collect(Collectors.toSet());

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java

@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "role")
+//@CacheConfig(cacheNames = "role")
 public class RoleServiceImpl implements RoleService {
 
     private final RoleRepository roleRepository;
@@ -80,7 +80,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    // @Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
     public RoleDto findById(long id) {
         Role role = roleRepository.findById(id).orElseGet(Role::new);
@@ -163,7 +163,7 @@ public class RoleServiceImpl implements RoleService {
     }
 
     @Override
-    @Cacheable(key = "'auth:' + #p0.id")
+    //  @Cacheable(key = "'auth:' + #p0.id")
     public List<AuthorityDto> mapToGrantedAuthorities(UserDto user) {
         Set<String> permissions = new HashSet<>();
         // 如果是管理员直接返回

eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "user")
+//@CacheConfig(cacheNames = "user")
 public class UserServiceImpl implements UserService {
 
     private final UserRepository userRepository;
@@ -73,7 +73,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    @Cacheable(key = "'id:' + #p0")
+    // @Cacheable(key = "'id:' + #p0")
     @Transactional(rollbackFor = Exception.class)
     public UserDto findById(long id) {
         User user = userRepository.findById(id).orElseGet(User::new);

eladmin-system/src/main/resources/config/application-dev.yml

@@ -4,9 +4,9 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://114.55.230.80:3306/efs?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      url: jdbc:log4jdbc:mysql://192.168.0.253:3306/efs?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
       username: root
-      password: QopraffaQWPRPPR123
+      password: 123456
       # 初始连接数
       initial-size: 5
       # 最小连接数
@@ -118,3 +118,7 @@ file:
   # 文件大小 /M
   maxSize: 100
   avatarMaxSize: 5
+html2Pdf:
+  simsumPath: font/simsun.ttf
+  simfangPath: font/simfang.ttf
+  toolName: OpenPDF

eladmin-system/src/main/resources/config/application.yml

@@ -25,11 +25,26 @@ spring:
   redis:
     #数据库索引
     database: 12
-    host: 114.55.230.80
+    host: 127.0.0.1
     port: 6379
-    password: 123qysd!@#
+#    password: 123qysd!@#
     #连接超时时间
     timeout: 5000
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/*Mapper.xml
+#  type-aliases-package: com.tcpp.FqNotarize.entity
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0    
+
 
 task:
   pool:

eladmin-system/src/main/resources/logback.xml

@@ -2,7 +2,7 @@
 <configuration scan="true" scanPeriod="30 seconds" debug="false">
     <contextName>elAdmin</contextName>
     <property name="log.charset" value="utf-8" />
-    <property name="log.pattern" value="%contextName- %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}) - %msg%n" />
+    <property name="log.pattern" value="%contextName %X{traceId} %d{yyyy-MM-dd HH:mm:ss:SSS}[%thread]%-5level%logger{50}-%msg%n" />
 
     <!--输出到控制台-->
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">

eladmin-tools/src/main/java/me/zhengjie/service/impl/AliPayServiceImpl.java

@@ -38,13 +38,13 @@ import java.util.Optional;
  */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "aliPay")
+//@CacheConfig(cacheNames = "aliPay")
 public class AliPayServiceImpl implements AliPayService {
 
     private final AliPayRepository alipayRepository;
 
     @Override
-    @Cacheable(key = "'config'")
+    // @Cacheable(key = "'config'")
     public AlipayConfig find() {
         Optional<AlipayConfig> alipayConfig = alipayRepository.findById(1L);
         return alipayConfig.orElseGet(AlipayConfig::new);

eladmin-tools/src/main/java/me/zhengjie/service/impl/EmailServiceImpl.java

@@ -37,7 +37,7 @@ import java.util.Optional;
  */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "email")
+//@CacheConfig(cacheNames = "email")
 public class EmailServiceImpl implements EmailService {
 
     private final EmailRepository emailRepository;
@@ -55,7 +55,7 @@ public class EmailServiceImpl implements EmailService {
     }
 
     @Override
-    @Cacheable(key = "'config'")
+    //   @Cacheable(key = "'config'")
     public EmailConfig find() {
         Optional<EmailConfig> emailConfig = emailRepository.findById(1L);
         return emailConfig.orElseGet(EmailConfig::new);

eladmin-tools/src/main/java/me/zhengjie/service/impl/QiNiuServiceImpl.java

@@ -55,7 +55,7 @@ import java.util.*;
  */
 @Service
 @RequiredArgsConstructor
-@CacheConfig(cacheNames = "qiNiu")
+//@CacheConfig(cacheNames = "qiNiu")
 public class QiNiuServiceImpl implements QiNiuService {
 
     private final QiNiuConfigRepository qiNiuConfigRepository;
@@ -65,7 +65,7 @@ public class QiNiuServiceImpl implements QiNiuService {
     private Long maxSize;
 
     @Override
-    @Cacheable(key = "'config'")
+    //  @Cacheable(key = "'config'")
     public QiniuConfig find() {
         Optional<QiniuConfig> qiniuConfig = qiNiuConfigRepository.findById(1L);
         return qiniuConfig.orElseGet(QiniuConfig::new);