调解系统修改

2024-04-02 15:56:40 +08:00
parent 08f4aca27c
commit 72026ee6f4
51 changed files with 3102 additions and 3242 deletions
@@ -11,6 +11,11 @@ public class CacheConstants
     * 登录用户 redis key
     */
    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+    /**
+     * 登录用户名 redis key
+     */
+
+    public static final String LOGIN_USERNAME_TOKEN_KEY = "login_username_tokens:";

    /**
     * 验证码 redis key
@@ -50,4 +55,16 @@ public class CacheConstants
     * 所有用户 redis key
     */
    public static final String USER_KEY = "user_key:";
+    /**
+     * 用户邮箱 redis key
+     */
+    public static final String USER_EMAIL_KEY = "user_email_key:";
+    /**
+     * 角色 redis key
+     */
+    public static final String ROLE_KEY = "role_key:";
+    /**
+     * 部门 redis key
+     */
+    public static final String DEPT_KEY = "dept_key:";
 }
@@ -141,7 +141,10 @@ public class Constants
     */
    public static final String LOOKUP_LDAPS = "ldaps:";
    public static final String DEFAULT_PASSWORD = "123456";
+    // 英文逗号分隔符
    public static final String SPLIT_COMMA =",";
+    // 中文逗号分隔符
+    public static final String CN_SPLIT_COMMA ="，";

    /**
     * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
@@ -0,0 +1,26 @@
+package com.ruoyi.common.core.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Classname SMSNotice
+ * @Description 消息通知
+ * @Version 1.0.0
+ * @Date 2024/3/26 11:13
+ * @Created wangqiong
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SMSNotice {
+    /**
+     * 申请人通知
+     */
+    private SMSNoticeDO applicantNotice;
+    /**
+     * 被申通知
+     */
+    private SMSNoticeDO resNotice;
+}
@@ -0,0 +1,34 @@
+package com.ruoyi.common.core.domain.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Classname SMSNoticeDO
+ * @Description 消息通知实体
+ * @Version 1.0.0
+ * @Date 2024/3/26 11:10
+ * @Created wangqiong
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SMSNoticeDO {
+    /**
+     * 主题
+     */
+    private String subject;
+    /**
+     * 发送内容
+     */
+    private String content;
+    /**
+     * 模板id
+     */
+    private String templateId;
+    /**
+     * 模板参数
+     */
+    private String[] templateParamSet;
+}
@@ -1,14 +1,15 @@
 package com.ruoyi.common.core.domain.entity;

-import java.util.ArrayList;
-import java.util.List;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.ArrayList;
+import java.util.List;

 /**
 * 部门表 sys_dept
@@ -54,6 +55,31 @@ public class SysDept extends BaseEntity

    /** 父部门名称 */
    private String parentName;
+    /**
+     * 代码（统一社会信用代码或者身份证号）
+     */
+    private String code;
+
+    /**
+     * 法定代表人
+     */
+    private String compLegalPerson;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getCompLegalPerson() {
+        return compLegalPerson;
+    }
+
+    public void setCompLegalPerson(String compLegalPerson) {
+        this.compLegalPerson = compLegalPerson;
+    }

    public Integer getDeptType() {
        return deptType;
@@ -69,6 +69,18 @@ public class SysUser extends BaseEntity
    /** 国籍，0-国内，1-国外，默认0 */

    private Integer nationality;
+    /**
+     * 生日
+     */
+    private Date birth;
+    /**
+     * 住所
+     */
+    private String home;
+    /**
+     * 联系地址
+     */
+    private String address;

    /** 用户邮箱 */
    @Excel(name = "用户邮箱")
@@ -140,6 +152,38 @@ public class SysUser extends BaseEntity
        this.userId = userId;
    }

+    public Date getBirth() {
+        return birth;
+    }
+
+    public void setBirth(Date birth) {
+        this.birth = birth;
+    }
+
+    public String getHome() {
+        return home;
+    }
+
+    public void setHome(String home) {
+        this.home = home;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public List<SysDept> getDepts() {
+        return depts;
+    }
+
+    public void setDepts(List<SysDept> depts) {
+        this.depts = depts;
+    }
+
    public Integer getIdType() {
        return idType;
    }
@@ -0,0 +1,18 @@
+package com.ruoyi.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum DocumentTypeEnum {
+    EVEDENT_METERIAL("EVEDENT_METERIAL", "证据材料", 1),
+    EVEDENT_APPLY_BOOK("EVEDENT_APPLY_BOOK", "调解申请书", 2),
+    EVEDENT_MEDIATION_VIDEO("EVEDENT_MEDIATION_VIDEO", "调解视频", 3),
+    EVEDENT_MEDIATION_RECORD("EVEDENT_MEDIATION_RECORD", "调解笔录", 4),
+    EVEDENT_AGREEMENT("EVEDENT_AGREEMENT", "调解书或和解协议", 5),
+    ;
+    private String code;
+    private String name;
+    private Integer value;
+}
@@ -1,10 +1,12 @@
 package com.ruoyi.common.utils;


+import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.utils.uuid.UUID;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mail.MailException;
 import org.springframework.mail.SimpleMailMessage;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
@@ -72,17 +74,29 @@ public class EmailOutUtil {
     * @param subject 邮件主题
     * @param content 邮件内容（发送内容）
     */
-    public void sendMessage(String to, String subject, String content, String from, JavaMailSender mailSender) {
-        // 创建一个邮件对象
-        SimpleMailMessage msg = new SimpleMailMessage();
-        msg.setFrom(from);
-        msg.setTo(to);
-        // 设置邮件主题
-        msg.setSubject(subject);
-        // 设置邮件内容
-        msg.setText(content);
-        // 发送邮件
-        mailSender.send(msg);
+    public Boolean sendMessage(String to, String subject, String content, String from, JavaMailSender mailSender) {
+        try {
+            if(mailSender==null){
+                rebuildMailSender();
+            }
+            // 创建一个邮件对象
+            SimpleMailMessage msg = new SimpleMailMessage();
+            if(StrUtil.isEmpty(from)){
+                msg.setFrom(usernameOut);
+            }else {
+                msg.setFrom(from);
+            }
+            msg.setTo(to);
+            // 设置邮件主题
+            msg.setSubject(subject);
+            // 设置邮件内容
+            msg.setText(content);
+            // 发送邮件
+            mailSender.send(msg);
+        } catch (MailException e) {
+            return false;
+        }
+        return true;
        ////System.out.println("发送成功：" + from + ":to:" + to);
    }