修改模板信息

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -164,7 +164,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
 		String maxRole = userDomain.getUserMaxRole();
 		if ("超级管理员".equals(maxRole)) {
-		} else if ("公证处管理员".equals(maxRole)) {
+		} else if ("公证处管理员".equals(maxRole) || "公证书签发".equals(maxRole)) {
 			qw.eq("notary_office_id", user.getOrgId().split("_")[1]);
 		} else if ("公证员".equals(maxRole)) {
 			qw.eq("notary_office_id", user.getOrgId().split("_")[1]);

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/SmsTemplateServiceImpl.java

@@ -8,6 +8,11 @@ import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -183,7 +188,7 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 	public void remindSignNotarialCertificate(String businessNo) {
 		// 保存发送短信
 		// 查询发送的短信，如果发送过了就不发送
-		//发送短信
+		// 发送短信
 		QueryWrapper<SmsSendLogEntity> log = new QueryWrapper<>();
 		log.eq("business_no", businessNo);
 		log.eq("order_type", 5);
@@ -236,7 +241,12 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 		log.setUpdateTime(LocalDateTime.now());
 		log.setReturnContent(result);
 		log.setOrderType(orderType);
-		sendLogMapper.insert(log);
+		try {
+			sendLogMapper.insert(log);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 
 	/**
@@ -274,6 +284,11 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 		log.setUpdateTime(LocalDateTime.now());
 		log.setReturnContent(result);
 		log.setOrderType(orderType);
-		sendLogMapper.insert(log);
+		try {
+			sendLogMapper.insert(log);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/User.java

@@ -25,6 +25,9 @@ import javax.persistence.*;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
@@ -37,141 +40,150 @@ import java.util.Set;
 @Entity
 @Getter
 @Setter
-@Table(name="sys_user")
+@Table(name = "sys_user")
 public class User extends BaseEntity implements Serializable {
 
-    @Id
-    @Column(name = "user_id")
-    @NotNull(groups = Update.class)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value = "ID", hidden = true)
-    private Long id;
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    @ApiModelProperty(value = "用户角色")
-    @JoinTable(name = "sys_users_roles",
-            joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "user_id")},
-            inverseJoinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "role_id")})
-    private Set<Role> roles;
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    @ApiModelProperty(value = "用户岗位")
-    @JoinTable(name = "sys_users_jobs",
-            joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "user_id")},
-            inverseJoinColumns = {@JoinColumn(name = "job_id",referencedColumnName = "job_id")})
-    private Set<Job> jobs;
-
-    @OneToOne
-    @JoinColumn(name = "dept_id")
-    @ApiModelProperty(value = "用户部门")
-    private Dept dept;
-
-    @NotBlank
-    @Column(unique = true)
-    @ApiModelProperty(value = "用户名称")
-    private String username;
-
-    @NotBlank
-    @ApiModelProperty(value = "用户昵称")
-    private String nickName;
-
-    @Email
+	@Id
+	@Column(name = "user_id")
+	@NotNull(groups = Update.class)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@ApiModelProperty(value = "ID", hidden = true)
+	private Long id;
+
+	@ManyToMany(fetch = FetchType.EAGER)
+	@ApiModelProperty(value = "用户角色")
+	@JoinTable(name = "sys_users_roles", joinColumns = {
+			@JoinColumn(name = "user_id", referencedColumnName = "user_id") }, inverseJoinColumns = {
+					@JoinColumn(name = "role_id", referencedColumnName = "role_id") })
+	private Set<Role> roles;
+
+	@ManyToMany(fetch = FetchType.EAGER)
+	@ApiModelProperty(value = "用户岗位")
+	@JoinTable(name = "sys_users_jobs", joinColumns = {
+			@JoinColumn(name = "user_id", referencedColumnName = "user_id") }, inverseJoinColumns = {
+					@JoinColumn(name = "job_id", referencedColumnName = "job_id") })
+	private Set<Job> jobs;
+
+	@OneToOne
+	@JoinColumn(name = "dept_id")
+	@ApiModelProperty(value = "用户部门")
+	private Dept dept;
+
+	@NotBlank
+	@Column(unique = true)
+	@ApiModelProperty(value = "用户名称")
+	private String username;
+
+	@NotBlank
+	@ApiModelProperty(value = "用户昵称")
+	private String nickName;
+
+	@Email
 //    @NotBlank
-    @ApiModelProperty(value = "邮箱")
-    private String email;
-
-    @NotBlank
-    @ApiModelProperty(value = "电话号码")
-    private String phone;
-
-    @ApiModelProperty(value = "用户性别")
-    private String gender;
-
-    @ApiModelProperty(value = "头像真实名称",hidden = true)
-    private String avatarName;
-
-    @ApiModelProperty(value = "头像存储的路径", hidden = true)
-    private String avatarPath;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-    @NotNull
-    @ApiModelProperty(value = "是否启用")
-    private Boolean enabled;
-
-    @ApiModelProperty(value = "是否为admin账号", hidden = true)
-    private Boolean isAdmin = false;
-
-    @Column(name = "pwd_reset_time")
-    @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
-    private Date pwdResetTime;
-
-    @Column(name = "org_id")
-    @ApiModelProperty(value = "机构的id") // 银行或者公证处
-    private String orgId;
-
-    @Column(name = "id_card")
-    @ApiModelProperty(value = "身份证") // 用户身份证
-    private String idCard;
-
-    @Column(name = "sign_img_id")
-    @ApiModelProperty(value = "签名图片id")
-    private String signImgId;
-
-    @Column(name = "axq_user_id")
-    @ApiModelProperty(value = "安心签用户ID")
-    private String axqUserId;
-
-    @Column(name = "axq_seal_id")
-    @ApiModelProperty(value = "安心签签名图片ID")
-    private String axqSealId;
-
-    @Column(name = "axq_is_auth")
-    @ApiModelProperty(value = "安心签签名授权标记")
-    private String axqIsAuth;
-
-    @Transient
-    @TableField(exist = false)
-    @ApiModelProperty(value = "安心签签名授权验证码")
-    private String checkCode;
-    
-    @Transient
-    @TableField(exist = false)
-    @ApiModelProperty(value = "图片的id的值")
-    private String imageId;
-    /**
-     * 获取用户类型
-     * @return
-     */
-    public String getUserType(){
-        return orgId.split("_")[0];
-    }
-
-    /**
-     * 获取公司ID
-     * @return
-     */
-    public String getComId(){
-        return orgId.split("_")[1];
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        User user = (User) o;
-        return Objects.equals(id, user.id) &&
-                Objects.equals(username, user.username);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, username);
-    }
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@NotBlank
+	@ApiModelProperty(value = "电话号码")
+	private String phone;
+
+	@ApiModelProperty(value = "用户性别")
+	private String gender;
+
+	@ApiModelProperty(value = "头像真实名称", hidden = true)
+	private String avatarName;
+
+	@ApiModelProperty(value = "头像存储的路径", hidden = true)
+	private String avatarPath;
+
+	@ApiModelProperty(value = "密码")
+	private String password;
+
+	@NotNull
+	@ApiModelProperty(value = "是否启用")
+	private Boolean enabled;
+
+	@ApiModelProperty(value = "是否为admin账号", hidden = true)
+	private Boolean isAdmin = false;
+
+	@Column(name = "pwd_reset_time")
+	@ApiModelProperty(value = "最后修改密码的时间", hidden = true)
+	private Date pwdResetTime;
+
+	@Column(name = "org_id")
+	@ApiModelProperty(value = "机构的id") // 银行或者公证处
+	private String orgId;
+
+	@Column(name = "id_card")
+	@ApiModelProperty(value = "身份证") // 用户身份证
+	private String idCard;
+
+	@Column(name = "sign_img_id")
+	@ApiModelProperty(value = "签名图片id")
+	private String signImgId;
+
+	@Column(name = "axq_user_id")
+	@ApiModelProperty(value = "安心签用户ID")
+	private String axqUserId;
+
+	@Column(name = "axq_seal_id")
+	@ApiModelProperty(value = "安心签签名图片ID")
+	private String axqSealId;
+
+	@Column(name = "axq_is_auth")
+	@ApiModelProperty(value = "安心签签名授权标记")
+	private String axqIsAuth;
+
+	@Transient
+	@TableField(exist = false)
+	@ApiModelProperty(value = "安心签签名授权验证码")
+	private String checkCode;
+
+	@Transient
+	@TableField(exist = false)
+	@ApiModelProperty(value = "图片的id的值")
+	private String imageId;
+
+	/**
+	 * 获取用户类型
+	 * 
+	 * @return
+	 */
+	public String getUserType() {
+		if (StringUtils.isNotBlank(orgId) && orgId.contains(",")) {
+			return orgId.split("_")[0];
+		}
+		return "";
+
+	}
+
+	/**
+	 * 获取公司ID
+	 * 
+	 * @return
+	 */
+	public String getComId() {
+		// 增加非空判断
+		if (StringUtils.isNotBlank(orgId) && orgId.contains(",")) {
+			return orgId.split("_")[1];
+		}
+		return "";
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		User user = (User) o;
+		return Objects.equals(id, user.id) && Objects.equals(username, user.username);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, username);
+	}
 }

eladmin-system/src/main/java/me/zhengjie/domain/user/impl/UserDomainImpl.java

@@ -49,7 +49,10 @@ public class UserDomainImpl implements UserDomain {
             roleName = "客户经理";
         } else if (roleNameSet.contains("银行客户经理")) {
             roleName = "客户经理";
+        }else if (roleNameSet.contains("公证书签发")) {
+            roleName = "公证书签发";
         }
+        
         return roleName;
     }
 }