🎨 style(entity,dto,service,...): 实体等pojo主键变为Long类型
This commit is contained in:
parent
15e82e3ded
commit
35cc83ec00
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.dto;
|
package com.rymcu.forest.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -8,7 +9,8 @@ import lombok.Data;
|
|||||||
@Data
|
@Data
|
||||||
public class ChangeEmailDTO {
|
public class ChangeEmailDTO {
|
||||||
|
|
||||||
private Integer idUser;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idUser;
|
||||||
|
|
||||||
private String email;
|
private String email;
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.dto;
|
package com.rymcu.forest.dto;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -8,7 +9,8 @@ import lombok.Data;
|
|||||||
@Data
|
@Data
|
||||||
public class UpdatePasswordDTO {
|
public class UpdatePasswordDTO {
|
||||||
|
|
||||||
private Integer idUser;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idUser;
|
||||||
|
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.dto.admin;
|
package com.rymcu.forest.dto.admin;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -8,7 +9,9 @@ import lombok.Data;
|
|||||||
@Data
|
@Data
|
||||||
public class TopicTagDTO {
|
public class TopicTagDTO {
|
||||||
|
|
||||||
private Integer idTopic;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idTopic;
|
||||||
|
|
||||||
private Integer idTag;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idTag;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.dto.admin;
|
package com.rymcu.forest.dto.admin;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -7,7 +8,10 @@ import lombok.Data;
|
|||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class UserRoleDTO {
|
public class UserRoleDTO {
|
||||||
private Integer idUser;
|
|
||||||
|
|
||||||
private Integer idRole;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idUser;
|
||||||
|
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idRole;
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -18,7 +19,8 @@ public class ArticleContent {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idArticle;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idArticle;
|
||||||
|
|
||||||
private String articleContent;
|
private String articleContent;
|
||||||
|
|
||||||
|
@ -22,11 +22,13 @@ public class ArticleThumbsUp implements Serializable, Cloneable {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idArticleThumbsUp;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idArticleThumbsUp;
|
||||||
/**
|
/**
|
||||||
* 文章表主键
|
* 文章表主键
|
||||||
*/
|
*/
|
||||||
private Integer idArticle;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idArticle;
|
||||||
/**
|
/**
|
||||||
* 用户表主键
|
* 用户表主键
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField;
|
import com.alibaba.fastjson.annotation.JSONField;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -21,15 +22,17 @@ public class Bank {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idBank;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idBank;
|
||||||
/** 银行名称 */
|
/** 银行名称 */
|
||||||
private String bankName;
|
private String bankName;
|
||||||
/** 银行负责人 */
|
/** 银行负责人 */
|
||||||
private Integer bankOwner;
|
private Long bankOwner;
|
||||||
/** 银行描述 */
|
/** 银行描述 */
|
||||||
private String bankDescription;
|
private String bankDescription;
|
||||||
/** 创建人 */
|
/** 创建人 */
|
||||||
private Integer createdBy;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long createdBy;
|
||||||
/** 创建时间 */
|
/** 创建时间 */
|
||||||
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
|
||||||
private Date createdTime;
|
private Date createdTime;
|
||||||
|
@ -22,9 +22,11 @@ public class BankAccount {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idBankAccount;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idBankAccount;
|
||||||
/** 所属银行 */
|
/** 所属银行 */
|
||||||
private Integer idBank;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idBank;
|
||||||
/** 银行账户 */
|
/** 银行账户 */
|
||||||
private String bankAccount;
|
private String bankAccount;
|
||||||
/** 账户余额 */
|
/** 账户余额 */
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.GeneratedValue;
|
import javax.persistence.GeneratedValue;
|
||||||
@ -18,11 +19,13 @@ public class CurrencyIssue {
|
|||||||
/** 主键 */
|
/** 主键 */
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer id;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long id;
|
||||||
/** 发行数额 */
|
/** 发行数额 */
|
||||||
private BigDecimal issueValue;
|
private BigDecimal issueValue;
|
||||||
/** 发行人 */
|
/** 发行人 */
|
||||||
private Integer createdBy;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long createdBy;
|
||||||
/** 发行时间 */
|
/** 发行时间 */
|
||||||
private Date createdTime;
|
private Date createdTime;
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -21,7 +22,8 @@ public class CurrencyRule implements Serializable, Cloneable {
|
|||||||
@Id
|
@Id
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
private Integer idCurrencyRule;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idCurrencyRule;
|
||||||
/**
|
/**
|
||||||
* 规则名称
|
* 规则名称
|
||||||
*/
|
*/
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import tk.mybatis.mapper.annotation.ColumnType;
|
import tk.mybatis.mapper.annotation.ColumnType;
|
||||||
|
|
||||||
@ -19,7 +20,8 @@ public class Permission implements Serializable,Cloneable {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idPermission;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idPermission;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 权限标识
|
* 权限标识
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField;
|
import com.alibaba.fastjson.annotation.JSONField;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -26,7 +27,8 @@ public class Product implements Serializable, Cloneable {
|
|||||||
@Id
|
@Id
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
private Integer idProduct;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idProduct;
|
||||||
/**
|
/**
|
||||||
* 产品名
|
* 产品名
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField;
|
import com.alibaba.fastjson.annotation.JSONField;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Table;
|
import javax.persistence.Table;
|
||||||
@ -20,7 +21,8 @@ public class ProductContent implements Serializable, Cloneable {
|
|||||||
/**
|
/**
|
||||||
* 产品表主键
|
* 产品表主键
|
||||||
*/
|
*/
|
||||||
private Integer idProduct;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idProduct;
|
||||||
/**
|
/**
|
||||||
* 产品详情原文
|
* 产品详情原文
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
import com.alibaba.fastjson.annotation.JSONField;
|
import com.alibaba.fastjson.annotation.JSONField;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -19,7 +20,8 @@ public class Role implements Serializable,Cloneable {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idRole;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idRole;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 角色名称
|
* 角色名称
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -19,7 +20,8 @@ public class SpecialDay implements Serializable,Cloneable{
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idSpecialDay;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idSpecialDay;
|
||||||
/** 名称 */
|
/** 名称 */
|
||||||
private String specialDayName;
|
private String specialDayName;
|
||||||
/** 权重/优先级,小数优秀 */
|
/** 权重/优先级,小数优秀 */
|
||||||
|
@ -21,7 +21,8 @@ public class Sponsor implements Serializable, Cloneable {
|
|||||||
*/
|
*/
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer id;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long id;
|
||||||
/**
|
/**
|
||||||
* 数据类型
|
* 数据类型
|
||||||
*/
|
*/
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -19,7 +20,8 @@ public class Tag implements Serializable,Cloneable {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idTag;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idTag;
|
||||||
/** 标签名 */
|
/** 标签名 */
|
||||||
private String tagTitle;
|
private String tagTitle;
|
||||||
/** 标签图标 */
|
/** 标签图标 */
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -19,7 +20,8 @@ public class Topic {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idTopic;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idTopic;
|
||||||
/** 专题标题 */
|
/** 专题标题 */
|
||||||
private String topicTitle;
|
private String topicTitle;
|
||||||
/** 专题路径 */
|
/** 专题路径 */
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -20,7 +21,8 @@ public class TransactionRecord {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idTransactionRecord;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idTransactionRecord;
|
||||||
/** 交易流水号 */
|
/** 交易流水号 */
|
||||||
private String transactionNo;
|
private String transactionNo;
|
||||||
/** 款项 */
|
/** 款项 */
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Id;
|
import javax.persistence.Id;
|
||||||
@ -13,6 +14,7 @@ import javax.persistence.Table;
|
|||||||
public class UserExtend {
|
public class UserExtend {
|
||||||
|
|
||||||
@Id
|
@Id
|
||||||
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
private Long idUser;
|
private Long idUser;
|
||||||
|
|
||||||
private String github;
|
private String github;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.rymcu.forest.entity;
|
package com.rymcu.forest.entity;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
@ -17,7 +18,8 @@ public class WxUser {
|
|||||||
@Id
|
@Id
|
||||||
@Column(name = "id")
|
@Column(name = "id")
|
||||||
@GeneratedValue(generator = "JDBC")
|
@GeneratedValue(generator = "JDBC")
|
||||||
private Integer idWxUser;
|
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||||
|
private Long idWxUser;
|
||||||
|
|
||||||
private Boolean subscribe;
|
private Boolean subscribe;
|
||||||
|
|
||||||
|
@ -14,5 +14,5 @@ public interface ArticleThumbsUpMapper extends Mapper<ArticleThumbsUp> {
|
|||||||
* @param thumbsUpNumber
|
* @param thumbsUpNumber
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer updateArticleThumbsUpNumber(@Param("idArticle") Integer idArticle, @Param("thumbsUpNumber") Integer thumbsUpNumber);
|
Integer updateArticleThumbsUpNumber(@Param("idArticle") Long idArticle, @Param("thumbsUpNumber") Integer thumbsUpNumber);
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ public interface BankAccountMapper extends Mapper<BankAccount> {
|
|||||||
* @param idBank
|
* @param idBank
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
BankAccountDTO selectBankAccount(@Param("idBank") Integer idBank);
|
BankAccountDTO selectBankAccount(@Param("idBank") Long idBank);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取当前最大卡号
|
* 获取当前最大卡号
|
||||||
|
@ -8,5 +8,5 @@ import java.util.List;
|
|||||||
|
|
||||||
public interface PermissionMapper extends Mapper<Permission> {
|
public interface PermissionMapper extends Mapper<Permission> {
|
||||||
|
|
||||||
List<Permission> selectMenuByIdRole(@Param("role") Integer role);
|
List<Permission> selectMenuByIdRole(@Param("role") Long role);
|
||||||
}
|
}
|
@ -12,7 +12,7 @@ public interface RoleMapper extends Mapper<Role> {
|
|||||||
|
|
||||||
Role selectRoleByInputCode(@Param("inputCode") String inputCode);
|
Role selectRoleByInputCode(@Param("inputCode") String inputCode);
|
||||||
|
|
||||||
Integer updateStatus(@Param("idRole") Integer idRole, @Param("status") String status);
|
Integer updateStatus(@Param("idRole") Long idRole, @Param("status") String status);
|
||||||
|
|
||||||
Integer update(@Param("idRole") Integer idRole, @Param("name") String name, @Param("inputCode") String inputCode, @Param("weights") Integer weights);
|
Integer update(@Param("idRole") Long idRole, @Param("name") String name, @Param("inputCode") String inputCode, @Param("weights") Integer weights);
|
||||||
}
|
}
|
@ -18,7 +18,7 @@ public interface TagMapper extends Mapper<Tag> {
|
|||||||
* @param idArticle
|
* @param idArticle
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer insertTagArticle(@Param("idTag") Integer idTag, @Param("idArticle") Long idArticle);
|
Integer insertTagArticle(@Param("idTag") Long idTag, @Param("idArticle") Long idArticle);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 统计标签使用数(文章)
|
* 统计标签使用数(文章)
|
||||||
@ -26,7 +26,7 @@ public interface TagMapper extends Mapper<Tag> {
|
|||||||
* @param idArticle
|
* @param idArticle
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer selectCountTagArticleById(@Param("idTag") Integer idTag, @Param("idArticle") Long idArticle);
|
Integer selectCountTagArticleById(@Param("idTag") Long idTag, @Param("idArticle") Long idArticle);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取用户标签数
|
* 获取用户标签数
|
||||||
@ -34,7 +34,7 @@ public interface TagMapper extends Mapper<Tag> {
|
|||||||
* @param idTag
|
* @param idTag
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer selectCountUserTagById(@Param("idUser") Long idUser, @Param("idTag") Integer idTag);
|
Integer selectCountUserTagById(@Param("idUser") Long idUser, @Param("idTag") Long idTag);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 插入用户标签信息
|
* 插入用户标签信息
|
||||||
@ -43,7 +43,7 @@ public interface TagMapper extends Mapper<Tag> {
|
|||||||
* @param type
|
* @param type
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer insertUserTag(@Param("idTag") Integer idTag, @Param("idUser") Long idUser, @Param("type") Integer type);
|
Integer insertUserTag(@Param("idTag") Long idTag, @Param("idUser") Long idUser, @Param("type") Integer type);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除未使用标签
|
* 删除未使用标签
|
||||||
@ -61,7 +61,7 @@ public interface TagMapper extends Mapper<Tag> {
|
|||||||
* @param tagReservation
|
* @param tagReservation
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer update(@Param("idTag") Integer idTag, @Param("tagUri") String tagUri, @Param("tagIconPath") String tagIconPath, @Param("tagStatus") String tagStatus, @Param("tagDescription") String tagDescription, @Param("tagReservation") String tagReservation);
|
Integer update(@Param("idTag") Long idTag, @Param("tagUri") String tagUri, @Param("tagIconPath") String tagIconPath, @Param("tagStatus") String tagStatus, @Param("tagDescription") String tagDescription, @Param("tagReservation") String tagReservation);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询标签列表
|
* 查询标签列表
|
||||||
|
@ -44,21 +44,21 @@ public interface TopicMapper extends Mapper<Topic> {
|
|||||||
* @param topicDescriptionHtml
|
* @param topicDescriptionHtml
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer update(@Param("idTopic") Integer idTopic, @Param("topicTitle") String topicTitle, @Param("topicUri") String topicUri, @Param("topicIconPath") String topicIconPath, @Param("topicNva") String topicNva, @Param("topicStatus") String topicStatus, @Param("topicSort") Integer topicSort, @Param("topicDescription") String topicDescription, @Param("topicDescriptionHtml") String topicDescriptionHtml);
|
Integer update(@Param("idTopic") Long idTopic, @Param("topicTitle") String topicTitle, @Param("topicUri") String topicUri, @Param("topicIconPath") String topicIconPath, @Param("topicNva") String topicNva, @Param("topicStatus") String topicStatus, @Param("topicSort") Integer topicSort, @Param("topicDescription") String topicDescription, @Param("topicDescriptionHtml") String topicDescriptionHtml);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param idTopic
|
* @param idTopic
|
||||||
* @param tagTitle
|
* @param tagTitle
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<Tag> selectUnbindTagsById(@Param("idTopic") Integer idTopic, @Param("tagTitle") String tagTitle);
|
List<Tag> selectUnbindTagsById(@Param("idTopic") Long idTopic, @Param("tagTitle") String tagTitle);
|
||||||
|
|
||||||
Integer insertTopicTag(@Param("idTopic") Integer idTopic, @Param("idTag") Integer idTag);
|
Integer insertTopicTag(@Param("idTopic") Long idTopic, @Param("idTag") Long idTag);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param idTopic
|
* @param idTopic
|
||||||
* @param idTag
|
* @param idTag
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer deleteTopicTag(@Param("idTopic") Integer idTopic, @Param("idTag") Integer idTag);
|
Integer deleteTopicTag(@Param("idTopic") Long idTopic, @Param("idTag") Long idTag);
|
||||||
}
|
}
|
||||||
|
@ -28,7 +28,7 @@ public interface UserMapper extends Mapper<User> {
|
|||||||
* @param idRole
|
* @param idRole
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer insertUserRole(@Param("idUser") Long idUser, @Param("idRole") Integer idRole);
|
Integer insertUserRole(@Param("idUser") Long idUser, @Param("idRole") Long idRole);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据账号获取获取用户信息
|
* 根据账号获取获取用户信息
|
||||||
@ -65,7 +65,7 @@ public interface UserMapper extends Mapper<User> {
|
|||||||
* @param idRole
|
* @param idRole
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer updateUserRole(@Param("idUser") Integer idUser, @Param("idRole") Integer idRole);
|
Integer updateUserRole(@Param("idUser") Long idUser, @Param("idRole") Long idRole);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新用户状态
|
* 更新用户状态
|
||||||
@ -87,7 +87,7 @@ public interface UserMapper extends Mapper<User> {
|
|||||||
* @param idUser
|
* @param idUser
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
UserInfoDTO selectUserInfo(@Param("idUser") Integer idUser);
|
UserInfoDTO selectUserInfo(@Param("idUser") Long idUser);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新用户信息
|
* 更新用户信息
|
||||||
@ -128,7 +128,7 @@ public interface UserMapper extends Mapper<User> {
|
|||||||
* @param email
|
* @param email
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer updateEmail(@Param("idUser") Integer idUser, @Param("email") String email);
|
Integer updateEmail(@Param("idUser") Long idUser, @Param("email") String email);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新密码
|
* 更新密码
|
||||||
@ -136,7 +136,7 @@ public interface UserMapper extends Mapper<User> {
|
|||||||
* @param password
|
* @param password
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Integer updatePasswordById(@Param("idUser") Integer idUser, @Param("password") String password);
|
Integer updatePasswordById(@Param("idUser") Long idUser, @Param("password") String password);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询用户数据
|
* 查询用户数据
|
||||||
|
@ -35,7 +35,7 @@ public interface RoleService extends Service<Role> {
|
|||||||
* @param status
|
* @param status
|
||||||
* @return
|
* @return
|
||||||
* */
|
* */
|
||||||
Map updateStatus(Integer idRole, String status);
|
Map updateStatus(Long idRole, String status);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 添加/更新角色
|
* 添加/更新角色
|
||||||
|
@ -39,7 +39,7 @@ public interface TopicService extends Service<Topic> {
|
|||||||
* @param tagTitle
|
* @param tagTitle
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
List<Tag> findUnbindTagsById(Integer idTopic, String tagTitle);
|
List<Tag> findUnbindTagsById(Long idTopic, String tagTitle);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 绑定标签
|
* 绑定标签
|
||||||
|
@ -63,7 +63,7 @@ public interface UserService extends Service<User> {
|
|||||||
* @param idRole 角色 id
|
* @param idRole 角色 id
|
||||||
* @return Map
|
* @return Map
|
||||||
* */
|
* */
|
||||||
Map updateUserRole(Integer idUser, Integer idRole);
|
Map updateUserRole(Long idUser, Long idRole);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新用户状态
|
* 更新用户状态
|
||||||
@ -78,7 +78,7 @@ public interface UserService extends Service<User> {
|
|||||||
* @param idUser
|
* @param idUser
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Map findUserInfo(Integer idUser);
|
Map findUserInfo(Long idUser);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新用户信息
|
* 更新用户信息
|
||||||
|
@ -49,7 +49,7 @@ public class BankAccountServiceImpl extends AbstractService<BankAccount> impleme
|
|||||||
} else {
|
} else {
|
||||||
bankAccount.setAccountBalance(new BigDecimal("0"));
|
bankAccount.setAccountBalance(new BigDecimal("0"));
|
||||||
// 默认为社区发展与改革银行
|
// 默认为社区发展与改革银行
|
||||||
bankAccount.setIdBank(2);
|
bankAccount.setIdBank(2L);
|
||||||
bankAccount.setBankAccount(nextBankAccount());
|
bankAccount.setBankAccount(nextBankAccount());
|
||||||
bankAccount.setCreatedTime(new Date());
|
bankAccount.setCreatedTime(new Date());
|
||||||
bankAccountMapper.insertSelective(bankAccount);
|
bankAccountMapper.insertSelective(bankAccount);
|
||||||
@ -77,7 +77,7 @@ public class BankAccountServiceImpl extends AbstractService<BankAccount> impleme
|
|||||||
@Override
|
@Override
|
||||||
public BankAccount findSystemBankAccount() {
|
public BankAccount findSystemBankAccount() {
|
||||||
BankAccount bankAccount = new BankAccount();
|
BankAccount bankAccount = new BankAccount();
|
||||||
bankAccount.setIdBank(1);
|
bankAccount.setIdBank(1L);
|
||||||
bankAccount.setAccountType("1");
|
bankAccount.setAccountType("1");
|
||||||
bankAccount.setAccountOwner(2L);
|
bankAccount.setAccountOwner(2L);
|
||||||
return bankAccountMapper.selectOne(bankAccount);
|
return bankAccountMapper.selectOne(bankAccount);
|
||||||
|
@ -38,7 +38,7 @@ public class RoleServiceImpl extends AbstractService<Role> implements RoleServic
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional
|
@Transactional
|
||||||
public Map updateStatus(Integer idRole, String status) {
|
public Map updateStatus(Long idRole, String status) {
|
||||||
Map map = new HashMap(1);
|
Map map = new HashMap(1);
|
||||||
Integer result = roleMapper.updateStatus(idRole,status);
|
Integer result = roleMapper.updateStatus(idRole,status);
|
||||||
if(result == 0) {
|
if(result == 0) {
|
||||||
|
@ -101,7 +101,7 @@ public class TopicServiceImpl extends AbstractService<Topic> implements TopicSer
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<Tag> findUnbindTagsById(Integer idTopic, String tagTitle) {
|
public List<Tag> findUnbindTagsById(Long idTopic, String tagTitle) {
|
||||||
if (StringUtils.isBlank(tagTitle)) {
|
if (StringUtils.isBlank(tagTitle)) {
|
||||||
tagTitle = "";
|
tagTitle = "";
|
||||||
}
|
}
|
||||||
|
@ -158,7 +158,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
public Map updateUserRole(Integer idUser, Integer idRole) {
|
public Map updateUserRole(Long idUser, Long idRole) {
|
||||||
Map map = new HashMap(2);
|
Map map = new HashMap(2);
|
||||||
Integer result = userMapper.updateUserRole(idUser, idRole);
|
Integer result = userMapper.updateUserRole(idUser, idRole);
|
||||||
if (result == 0) {
|
if (result == 0) {
|
||||||
@ -179,7 +179,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map findUserInfo(Integer idUser) {
|
public Map findUserInfo(Long idUser) {
|
||||||
Map map = new HashMap(2);
|
Map map = new HashMap(2);
|
||||||
UserInfoDTO user = userMapper.selectUserInfo(idUser);
|
UserInfoDTO user = userMapper.selectUserInfo(idUser);
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
@ -271,7 +271,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
|
|||||||
public Map updateEmail(ChangeEmailDTO changeEmailDTO) {
|
public Map updateEmail(ChangeEmailDTO changeEmailDTO) {
|
||||||
Map map = new HashMap(2);
|
Map map = new HashMap(2);
|
||||||
map.put("message", "验证码无效!");
|
map.put("message", "验证码无效!");
|
||||||
Integer idUser = changeEmailDTO.getIdUser();
|
Long idUser = changeEmailDTO.getIdUser();
|
||||||
String email = changeEmailDTO.getEmail();
|
String email = changeEmailDTO.getEmail();
|
||||||
String code = changeEmailDTO.getCode();
|
String code = changeEmailDTO.getCode();
|
||||||
String vCode = redisService.get(email);
|
String vCode = redisService.get(email);
|
||||||
|
@ -129,7 +129,7 @@ public class AdminController {
|
|||||||
|
|
||||||
@GetMapping("/topic/unbind-topic-tags")
|
@GetMapping("/topic/unbind-topic-tags")
|
||||||
public GlobalResult<PageInfo<Tag>> unbindTopicTags(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "10") Integer rows, HttpServletRequest request){
|
public GlobalResult<PageInfo<Tag>> unbindTopicTags(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "10") Integer rows, HttpServletRequest request){
|
||||||
Integer idTopic = Integer.valueOf(request.getParameter("idTopic"));
|
Long idTopic = Long.valueOf(request.getParameter("idTopic"));
|
||||||
String tagTitle = request.getParameter("tagTitle");
|
String tagTitle = request.getParameter("tagTitle");
|
||||||
PageHelper.startPage(page, rows);
|
PageHelper.startPage(page, rows);
|
||||||
List<Tag> list = topicService.findUnbindTagsById(idTopic, tagTitle);
|
List<Tag> list = topicService.findUnbindTagsById(idTopic, tagTitle);
|
||||||
|
@ -34,7 +34,7 @@ public class UserInfoController {
|
|||||||
|
|
||||||
@GetMapping("/detail/{idUser}")
|
@GetMapping("/detail/{idUser}")
|
||||||
@SecurityInterceptor
|
@SecurityInterceptor
|
||||||
public GlobalResult detail(@PathVariable Integer idUser) {
|
public GlobalResult detail(@PathVariable Long idUser) {
|
||||||
Map map = userService.findUserInfo(idUser);
|
Map map = userService.findUserInfo(idUser);
|
||||||
return GlobalResultGenerator.genSuccessResult(map);
|
return GlobalResultGenerator.genSuccessResult(map);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user