Skip to content

polysoft-nafmii / polysoft-parent

Go to a project
Commit a72d87a1 by zhoujinghao
Options

修改包结构

1 parent 28f89388
Inline Side-by-side
Showing 40 changed files with 195 additions and 4131 deletions
nafmii-admin/src/main/java/org/nafmii/admin/controller/TestController.java → nafmii-admin/src/main/java/org/nafmii/admin/user/controller/TestController.java
package org.nafmii.admin.controller; package org.nafmii.admin.user.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.nafmii.admin.user.service.TestService;
import org.nafmii.admin.service.TestService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
nafmii-admin/src/main/java/org/nafmii/admin/service/impl/TestServiceImpl.java → nafmii-admin/src/main/java/org/nafmii/admin/user/service/impl/TestServiceImpl.java
package org.nafmii.admin.service.impl; package org.nafmii.admin.user.service.impl;
import org.nafmii.admin.service.TestService; import org.nafmii.admin.user.service.TestService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
......
nafmii-app/src/main/java/org/nafmii/app/NafmiiAppApplication.java
...@@ -6,10 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; ...@@ -6,10 +6,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient; import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication(scanBasePackages={"org.nafmii","org.nafmii.exception"}) @SpringBootApplication(scanBasePackages={"org.nafmii"})
@EnableEurekaClient @EnableEurekaClient
@EnableFeignClients @EnableFeignClients
@MapperScan("org.nafmii/**/mapper") @MapperScan("org.nafmii.app.user.dao")
public class NafmiiAppApplication { public class NafmiiAppApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
nafmii-app/src/main/java/org/nafmii/app/dto/user/RegisterDto.java deleted 100644 → 0
package org.nafmii.app.dto.user;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/26 13:39
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("app用户注册参数对象")
public class RegisterDto {
@NotNull(message = "手机号或登录账号不能为空")
@ApiModelProperty("手机号/登录账号")
private String phone;
@ApiModelProperty("头像图片地址")
private String headPicture;
@NotNull(message = "验证码不能为空")
@ApiModelProperty("验证码")
private String code;
@NotNull(message = "注册密码不能为空")
@ApiModelProperty("登陆密码")
private String loginPwd;
@NotNull(message = "确认密码不能为空")
@ApiModelProperty("确认密码")
private String confirmPwd;
}
nafmii-app/src/main/java/org/nafmii/app/entity/CenterRole.java deleted 100644 → 0
package org.nafmii.app.entity;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class CenterRole implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "角色名称")
private String rName;
@ApiModelProperty(value = "创建时间")
private Date creatTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "启用禁用 0 启用 1禁用")
private String isEnable;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getrName() {
return rName;
}
public void setrName(String rName) {
this.rName = rName;
}
public Date getCreatTime() {
return creatTime;
}
public void setCreatTime(Date creatTime) {
this.creatTime = creatTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getIsEnable() {
return isEnable;
}
public void setIsEnable(String isEnable) {
this.isEnable = isEnable;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", rName=").append(rName);
sb.append(", creatTime=").append(creatTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", isEnable=").append(isEnable);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/app/entity/user/AppUser.java deleted 100644 → 0
package org.nafmii.app.entity.user;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class AppUser implements Serializable {
private Long id;
@ApiModelProperty(value = "昵称")
private String userName;
@ApiModelProperty(value = "登录密码")
private String loginPwd;
@ApiModelProperty(value = "中文姓名")
private String realName;
@ApiModelProperty(value = "手机号/登录账号")
private String phone;
@ApiModelProperty(value = "出生日期")
private String birthday;
@ApiModelProperty(value = "邮箱")
private String email;
@ApiModelProperty(value = "头像图片地址")
private String headPicture;
@ApiModelProperty(value = "国籍")
private String nationality;
@ApiModelProperty(value = "单位全称")
private String unitName;
@ApiModelProperty(value = "微信OPENT_ID")
private String openId;
@ApiModelProperty(value = "是否开启指纹登录 0 未开启 1 已开启")
private String figerprintFalg;
@ApiModelProperty(value = "是否开启人脸识别登录 0 未开启 1 已开启")
private String faceidFalg;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "是否有效标识 0 有效用户 1无效用户")
private String isEnable;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getLoginPwd() {
return loginPwd;
}
public void setLoginPwd(String loginPwd) {
this.loginPwd = loginPwd;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getHeadPicture() {
return headPicture;
}
public void setHeadPicture(String headPicture) {
this.headPicture = headPicture;
}
public String getNationality() {
return nationality;
}
public void setNationality(String nationality) {
this.nationality = nationality;
}
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public String getOpenId() {
return openId;
}
public void setOpenId(String openId) {
this.openId = openId;
}
public String getFigerprintFalg() {
return figerprintFalg;
}
public void setFigerprintFalg(String figerprintFalg) {
this.figerprintFalg = figerprintFalg;
}
public String getFaceidFalg() {
return faceidFalg;
}
public void setFaceidFalg(String faceidFalg) {
this.faceidFalg = faceidFalg;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getIsEnable() {
return isEnable;
}
public void setIsEnable(String isEnable) {
this.isEnable = isEnable;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", userName=").append(userName);
sb.append(", loginPwd=").append(loginPwd);
sb.append(", realName=").append(realName);
sb.append(", phone=").append(phone);
sb.append(", birthday=").append(birthday);
sb.append(", email=").append(email);
sb.append(", headPicture=").append(headPicture);
sb.append(", nationality=").append(nationality);
sb.append(", unitName=").append(unitName);
sb.append(", openId=").append(openId);
sb.append(", figerprintFalg=").append(figerprintFalg);
sb.append(", faceidFalg=").append(faceidFalg);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", isEnable=").append(isEnable);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/app/entity/user/AppUserExample.java deleted 100644 → 0
package org.nafmii.app.entity.user;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class AppUserExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public AppUserExample() {
oredCriteria = new ArrayList<>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("ID is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("ID is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("ID =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("ID <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("ID >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("ID >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("ID <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("ID <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("ID not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("ID between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("ID not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andUserNameIsNull() {
addCriterion("USER_NAME is null");
return (Criteria) this;
}
public Criteria andUserNameIsNotNull() {
addCriterion("USER_NAME is not null");
return (Criteria) this;
}
public Criteria andUserNameEqualTo(String value) {
addCriterion("USER_NAME =", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotEqualTo(String value) {
addCriterion("USER_NAME <>", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThan(String value) {
addCriterion("USER_NAME >", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThanOrEqualTo(String value) {
addCriterion("USER_NAME >=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThan(String value) {
addCriterion("USER_NAME <", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThanOrEqualTo(String value) {
addCriterion("USER_NAME <=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLike(String value) {
addCriterion("USER_NAME like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotLike(String value) {
addCriterion("USER_NAME not like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameIn(List<String> values) {
addCriterion("USER_NAME in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotIn(List<String> values) {
addCriterion("USER_NAME not in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameBetween(String value1, String value2) {
addCriterion("USER_NAME between", value1, value2, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotBetween(String value1, String value2) {
addCriterion("USER_NAME not between", value1, value2, "userName");
return (Criteria) this;
}
public Criteria andLoginPwdIsNull() {
addCriterion("LOGIN_PWD is null");
return (Criteria) this;
}
public Criteria andLoginPwdIsNotNull() {
addCriterion("LOGIN_PWD is not null");
return (Criteria) this;
}
public Criteria andLoginPwdEqualTo(String value) {
addCriterion("LOGIN_PWD =", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotEqualTo(String value) {
addCriterion("LOGIN_PWD <>", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdGreaterThan(String value) {
addCriterion("LOGIN_PWD >", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdGreaterThanOrEqualTo(String value) {
addCriterion("LOGIN_PWD >=", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdLessThan(String value) {
addCriterion("LOGIN_PWD <", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdLessThanOrEqualTo(String value) {
addCriterion("LOGIN_PWD <=", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdLike(String value) {
addCriterion("LOGIN_PWD like", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotLike(String value) {
addCriterion("LOGIN_PWD not like", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdIn(List<String> values) {
addCriterion("LOGIN_PWD in", values, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotIn(List<String> values) {
addCriterion("LOGIN_PWD not in", values, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdBetween(String value1, String value2) {
addCriterion("LOGIN_PWD between", value1, value2, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotBetween(String value1, String value2) {
addCriterion("LOGIN_PWD not between", value1, value2, "loginPwd");
return (Criteria) this;
}
public Criteria andRealNameIsNull() {
addCriterion("REAL_NAME is null");
return (Criteria) this;
}
public Criteria andRealNameIsNotNull() {
addCriterion("REAL_NAME is not null");
return (Criteria) this;
}
public Criteria andRealNameEqualTo(String value) {
addCriterion("REAL_NAME =", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotEqualTo(String value) {
addCriterion("REAL_NAME <>", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameGreaterThan(String value) {
addCriterion("REAL_NAME >", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameGreaterThanOrEqualTo(String value) {
addCriterion("REAL_NAME >=", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameLessThan(String value) {
addCriterion("REAL_NAME <", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameLessThanOrEqualTo(String value) {
addCriterion("REAL_NAME <=", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameLike(String value) {
addCriterion("REAL_NAME like", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotLike(String value) {
addCriterion("REAL_NAME not like", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameIn(List<String> values) {
addCriterion("REAL_NAME in", values, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotIn(List<String> values) {
addCriterion("REAL_NAME not in", values, "realName");
return (Criteria) this;
}
public Criteria andRealNameBetween(String value1, String value2) {
addCriterion("REAL_NAME between", value1, value2, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotBetween(String value1, String value2) {
addCriterion("REAL_NAME not between", value1, value2, "realName");
return (Criteria) this;
}
public Criteria andPhoneIsNull() {
addCriterion("PHONE is null");
return (Criteria) this;
}
public Criteria andPhoneIsNotNull() {
addCriterion("PHONE is not null");
return (Criteria) this;
}
public Criteria andPhoneEqualTo(String value) {
addCriterion("PHONE =", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotEqualTo(String value) {
addCriterion("PHONE <>", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneGreaterThan(String value) {
addCriterion("PHONE >", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneGreaterThanOrEqualTo(String value) {
addCriterion("PHONE >=", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneLessThan(String value) {
addCriterion("PHONE <", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneLessThanOrEqualTo(String value) {
addCriterion("PHONE <=", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneLike(String value) {
addCriterion("PHONE like", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotLike(String value) {
addCriterion("PHONE not like", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneIn(List<String> values) {
addCriterion("PHONE in", values, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotIn(List<String> values) {
addCriterion("PHONE not in", values, "phone");
return (Criteria) this;
}
public Criteria andPhoneBetween(String value1, String value2) {
addCriterion("PHONE between", value1, value2, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotBetween(String value1, String value2) {
addCriterion("PHONE not between", value1, value2, "phone");
return (Criteria) this;
}
public Criteria andBirthdayIsNull() {
addCriterion("BIRTHDAY is null");
return (Criteria) this;
}
public Criteria andBirthdayIsNotNull() {
addCriterion("BIRTHDAY is not null");
return (Criteria) this;
}
public Criteria andBirthdayEqualTo(String value) {
addCriterion("BIRTHDAY =", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotEqualTo(String value) {
addCriterion("BIRTHDAY <>", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayGreaterThan(String value) {
addCriterion("BIRTHDAY >", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayGreaterThanOrEqualTo(String value) {
addCriterion("BIRTHDAY >=", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayLessThan(String value) {
addCriterion("BIRTHDAY <", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayLessThanOrEqualTo(String value) {
addCriterion("BIRTHDAY <=", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayLike(String value) {
addCriterion("BIRTHDAY like", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotLike(String value) {
addCriterion("BIRTHDAY not like", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayIn(List<String> values) {
addCriterion("BIRTHDAY in", values, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotIn(List<String> values) {
addCriterion("BIRTHDAY not in", values, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayBetween(String value1, String value2) {
addCriterion("BIRTHDAY between", value1, value2, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotBetween(String value1, String value2) {
addCriterion("BIRTHDAY not between", value1, value2, "birthday");
return (Criteria) this;
}
public Criteria andEmailIsNull() {
addCriterion("EMAIL is null");
return (Criteria) this;
}
public Criteria andEmailIsNotNull() {
addCriterion("EMAIL is not null");
return (Criteria) this;
}
public Criteria andEmailEqualTo(String value) {
addCriterion("EMAIL =", value, "email");
return (Criteria) this;
}
public Criteria andEmailNotEqualTo(String value) {
addCriterion("EMAIL <>", value, "email");
return (Criteria) this;
}
public Criteria andEmailGreaterThan(String value) {
addCriterion("EMAIL >", value, "email");
return (Criteria) this;
}
public Criteria andEmailGreaterThanOrEqualTo(String value) {
addCriterion("EMAIL >=", value, "email");
return (Criteria) this;
}
public Criteria andEmailLessThan(String value) {
addCriterion("EMAIL <", value, "email");
return (Criteria) this;
}
public Criteria andEmailLessThanOrEqualTo(String value) {
addCriterion("EMAIL <=", value, "email");
return (Criteria) this;
}
public Criteria andEmailLike(String value) {
addCriterion("EMAIL like", value, "email");
return (Criteria) this;
}
public Criteria andEmailNotLike(String value) {
addCriterion("EMAIL not like", value, "email");
return (Criteria) this;
}
public Criteria andEmailIn(List<String> values) {
addCriterion("EMAIL in", values, "email");
return (Criteria) this;
}
public Criteria andEmailNotIn(List<String> values) {
addCriterion("EMAIL not in", values, "email");
return (Criteria) this;
}
public Criteria andEmailBetween(String value1, String value2) {
addCriterion("EMAIL between", value1, value2, "email");
return (Criteria) this;
}
public Criteria andEmailNotBetween(String value1, String value2) {
addCriterion("EMAIL not between", value1, value2, "email");
return (Criteria) this;
}
public Criteria andHeadPictureIsNull() {
addCriterion("HEAD_PICTURE is null");
return (Criteria) this;
}
public Criteria andHeadPictureIsNotNull() {
addCriterion("HEAD_PICTURE is not null");
return (Criteria) this;
}
public Criteria andHeadPictureEqualTo(String value) {
addCriterion("HEAD_PICTURE =", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotEqualTo(String value) {
addCriterion("HEAD_PICTURE <>", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureGreaterThan(String value) {
addCriterion("HEAD_PICTURE >", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureGreaterThanOrEqualTo(String value) {
addCriterion("HEAD_PICTURE >=", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureLessThan(String value) {
addCriterion("HEAD_PICTURE <", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureLessThanOrEqualTo(String value) {
addCriterion("HEAD_PICTURE <=", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureLike(String value) {
addCriterion("HEAD_PICTURE like", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotLike(String value) {
addCriterion("HEAD_PICTURE not like", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureIn(List<String> values) {
addCriterion("HEAD_PICTURE in", values, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotIn(List<String> values) {
addCriterion("HEAD_PICTURE not in", values, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureBetween(String value1, String value2) {
addCriterion("HEAD_PICTURE between", value1, value2, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotBetween(String value1, String value2) {
addCriterion("HEAD_PICTURE not between", value1, value2, "headPicture");
return (Criteria) this;
}
public Criteria andNationalityIsNull() {
addCriterion("NATIONALITY is null");
return (Criteria) this;
}
public Criteria andNationalityIsNotNull() {
addCriterion("NATIONALITY is not null");
return (Criteria) this;
}
public Criteria andNationalityEqualTo(String value) {
addCriterion("NATIONALITY =", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotEqualTo(String value) {
addCriterion("NATIONALITY <>", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityGreaterThan(String value) {
addCriterion("NATIONALITY >", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityGreaterThanOrEqualTo(String value) {
addCriterion("NATIONALITY >=", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityLessThan(String value) {
addCriterion("NATIONALITY <", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityLessThanOrEqualTo(String value) {
addCriterion("NATIONALITY <=", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityLike(String value) {
addCriterion("NATIONALITY like", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotLike(String value) {
addCriterion("NATIONALITY not like", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityIn(List<String> values) {
addCriterion("NATIONALITY in", values, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotIn(List<String> values) {
addCriterion("NATIONALITY not in", values, "nationality");
return (Criteria) this;
}
public Criteria andNationalityBetween(String value1, String value2) {
addCriterion("NATIONALITY between", value1, value2, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotBetween(String value1, String value2) {
addCriterion("NATIONALITY not between", value1, value2, "nationality");
return (Criteria) this;
}
public Criteria andUnitNameIsNull() {
addCriterion("UNIT_NAME is null");
return (Criteria) this;
}
public Criteria andUnitNameIsNotNull() {
addCriterion("UNIT_NAME is not null");
return (Criteria) this;
}
public Criteria andUnitNameEqualTo(String value) {
addCriterion("UNIT_NAME =", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotEqualTo(String value) {
addCriterion("UNIT_NAME <>", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameGreaterThan(String value) {
addCriterion("UNIT_NAME >", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameGreaterThanOrEqualTo(String value) {
addCriterion("UNIT_NAME >=", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameLessThan(String value) {
addCriterion("UNIT_NAME <", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameLessThanOrEqualTo(String value) {
addCriterion("UNIT_NAME <=", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameLike(String value) {
addCriterion("UNIT_NAME like", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotLike(String value) {
addCriterion("UNIT_NAME not like", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameIn(List<String> values) {
addCriterion("UNIT_NAME in", values, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotIn(List<String> values) {
addCriterion("UNIT_NAME not in", values, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameBetween(String value1, String value2) {
addCriterion("UNIT_NAME between", value1, value2, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotBetween(String value1, String value2) {
addCriterion("UNIT_NAME not between", value1, value2, "unitName");
return (Criteria) this;
}
public Criteria andOpenIdIsNull() {
addCriterion("OPEN_ID is null");
return (Criteria) this;
}
public Criteria andOpenIdIsNotNull() {
addCriterion("OPEN_ID is not null");
return (Criteria) this;
}
public Criteria andOpenIdEqualTo(String value) {
addCriterion("OPEN_ID =", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotEqualTo(String value) {
addCriterion("OPEN_ID <>", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdGreaterThan(String value) {
addCriterion("OPEN_ID >", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
addCriterion("OPEN_ID >=", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdLessThan(String value) {
addCriterion("OPEN_ID <", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdLessThanOrEqualTo(String value) {
addCriterion("OPEN_ID <=", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdLike(String value) {
addCriterion("OPEN_ID like", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotLike(String value) {
addCriterion("OPEN_ID not like", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdIn(List<String> values) {
addCriterion("OPEN_ID in", values, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotIn(List<String> values) {
addCriterion("OPEN_ID not in", values, "openId");
return (Criteria) this;
}
public Criteria andOpenIdBetween(String value1, String value2) {
addCriterion("OPEN_ID between", value1, value2, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotBetween(String value1, String value2) {
addCriterion("OPEN_ID not between", value1, value2, "openId");
return (Criteria) this;
}
public Criteria andFigerprintFalgIsNull() {
addCriterion("FIGERPRINT_FALG is null");
return (Criteria) this;
}
public Criteria andFigerprintFalgIsNotNull() {
addCriterion("FIGERPRINT_FALG is not null");
return (Criteria) this;
}
public Criteria andFigerprintFalgEqualTo(String value) {
addCriterion("FIGERPRINT_FALG =", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotEqualTo(String value) {
addCriterion("FIGERPRINT_FALG <>", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgGreaterThan(String value) {
addCriterion("FIGERPRINT_FALG >", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgGreaterThanOrEqualTo(String value) {
addCriterion("FIGERPRINT_FALG >=", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgLessThan(String value) {
addCriterion("FIGERPRINT_FALG <", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgLessThanOrEqualTo(String value) {
addCriterion("FIGERPRINT_FALG <=", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgLike(String value) {
addCriterion("FIGERPRINT_FALG like", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotLike(String value) {
addCriterion("FIGERPRINT_FALG not like", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgIn(List<String> values) {
addCriterion("FIGERPRINT_FALG in", values, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotIn(List<String> values) {
addCriterion("FIGERPRINT_FALG not in", values, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgBetween(String value1, String value2) {
addCriterion("FIGERPRINT_FALG between", value1, value2, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotBetween(String value1, String value2) {
addCriterion("FIGERPRINT_FALG not between", value1, value2, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgIsNull() {
addCriterion("FACEID_FALG is null");
return (Criteria) this;
}
public Criteria andFaceidFalgIsNotNull() {
addCriterion("FACEID_FALG is not null");
return (Criteria) this;
}
public Criteria andFaceidFalgEqualTo(String value) {
addCriterion("FACEID_FALG =", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotEqualTo(String value) {
addCriterion("FACEID_FALG <>", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgGreaterThan(String value) {
addCriterion("FACEID_FALG >", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgGreaterThanOrEqualTo(String value) {
addCriterion("FACEID_FALG >=", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgLessThan(String value) {
addCriterion("FACEID_FALG <", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgLessThanOrEqualTo(String value) {
addCriterion("FACEID_FALG <=", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgLike(String value) {
addCriterion("FACEID_FALG like", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotLike(String value) {
addCriterion("FACEID_FALG not like", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgIn(List<String> values) {
addCriterion("FACEID_FALG in", values, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotIn(List<String> values) {
addCriterion("FACEID_FALG not in", values, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgBetween(String value1, String value2) {
addCriterion("FACEID_FALG between", value1, value2, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotBetween(String value1, String value2) {
addCriterion("FACEID_FALG not between", value1, value2, "faceidFalg");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("CREATE_TIME is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("CREATE_TIME is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("CREATE_TIME =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("CREATE_TIME <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("CREATE_TIME >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("CREATE_TIME <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("CREATE_TIME in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("CREATE_TIME not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("UPDATE_TIME is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("UPDATE_TIME is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("UPDATE_TIME =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("UPDATE_TIME <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("UPDATE_TIME >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("UPDATE_TIME >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("UPDATE_TIME <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("UPDATE_TIME <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("UPDATE_TIME in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("UPDATE_TIME not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andIsEnableIsNull() {
addCriterion("IS_ENABLE is null");
return (Criteria) this;
}
public Criteria andIsEnableIsNotNull() {
addCriterion("IS_ENABLE is not null");
return (Criteria) this;
}
public Criteria andIsEnableEqualTo(String value) {
addCriterion("IS_ENABLE =", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotEqualTo(String value) {
addCriterion("IS_ENABLE <>", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableGreaterThan(String value) {
addCriterion("IS_ENABLE >", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableGreaterThanOrEqualTo(String value) {
addCriterion("IS_ENABLE >=", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableLessThan(String value) {
addCriterion("IS_ENABLE <", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableLessThanOrEqualTo(String value) {
addCriterion("IS_ENABLE <=", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableLike(String value) {
addCriterion("IS_ENABLE like", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotLike(String value) {
addCriterion("IS_ENABLE not like", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableIn(List<String> values) {
addCriterion("IS_ENABLE in", values, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotIn(List<String> values) {
addCriterion("IS_ENABLE not in", values, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableBetween(String value1, String value2) {
addCriterion("IS_ENABLE between", value1, value2, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotBetween(String value1, String value2) {
addCriterion("IS_ENABLE not between", value1, value2, "isEnable");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/app/enums/UserEnum.java deleted 100644 → 0
package org.nafmii.app.enums;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/26 14:23
* @ClassName:用户枚举
* @version:
* @remark:
*/
public enum UserEnum {
/**
* 是否开启人脸识别登录 0 未开启 1 已开启
*/
FACE("1", "已开启"),
NOTFACE("0", "未开启"),
/**
* 是否开启指纹登录 0 未开启 1 已开启
*/
FINGERPRINT("1","已开启"),
NOTFINGERPRINT("0","未开启"),
/**
* 是否有效标识 0 有效用户 1无效用户
*/
ENABLE("0","有效用户"),
NOTENABLE("1","无效用户"),
LOGINPHONE("1","验证码"),
LOGINPWD("0","密码"),
;
UserEnum(String code, String name){
this.code = code;
this.name = name;
}
private String name;
private String code;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
}
nafmii-app/src/main/java/org/nafmii/app/feign/AdminService.java 0 → 100644
package org.nafmii.app.feign;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/22 9:04
* @ClassName:
* @version:
* @remark:
*/
@FeignClient(value = "nafmii-admin")
public interface AdminService {
//测试feign
@GetMapping("web/nafmii/test/search")
public String search();
}
nafmii-app/src/main/java/org/nafmii/app/mapper/user/AppUserMapper.java deleted 100644 → 0
package org.nafmii.app.mapper.user;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.nafmii.app.entity.user.AppUser;
import org.nafmii.app.entity.user.AppUserExample;
import org.nafmii.app.dto.user.LoginDto;
import org.nafmii.app.vo.UserVO;
import java.util.List;
@Mapper
public interface AppUserMapper {
long countByExample(AppUserExample example);
int deleteByExample(AppUserExample example);
int deleteByPrimaryKey(Long id);
int insert(AppUser record);
int insertSelective(AppUser record);
List<AppUser> selectByExample(AppUserExample example);
List<UserVO> selectByPassword(LoginDto loginDto);
List<UserVO> selectByPhone(@Param("phone") String phone);
AppUser selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") AppUser record, @Param("example") AppUserExample example);
int updateByExample(@Param("record") AppUser record, @Param("example") AppUserExample example);
int updateByPrimaryKeySelective(AppUser record);
int updateByPrimaryKey(AppUser record);
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/app/swagger/SwaggerConfig.java
...@@ -25,7 +25,7 @@ public class SwaggerConfig { ...@@ -25,7 +25,7 @@ public class SwaggerConfig {
// String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名 // String basePackage = ADMIN_SWAGGER;// 要暴露的API接口的基础包名
return new Docket (DocumentationType.SWAGGER_2) return new Docket (DocumentationType.SWAGGER_2)
.select () .select ()
.apis (RequestHandlerSelectors.basePackage ("org.nafmii")) .apis (RequestHandlerSelectors.basePackage ("org.nafmii.app"))
.paths (PathSelectors.any ()) .paths (PathSelectors.any ())
.build () .build ()
.apiInfo (apiInfo ()) .apiInfo (apiInfo ())
......
nafmii-app/src/main/java/org/nafmii/app/controller/AppController.java → nafmii-app/src/main/java/org/nafmii/app/user/controller/AppController.java
package org.nafmii.app.controller; package org.nafmii.app.user.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.nafmii.app.service.AppService; import org.nafmii.app.user.service.AppService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
......
nafmii-app/src/main/java/org/nafmii/app/controller/UserController.java → nafmii-app/src/main/java/org/nafmii/app/user/controller/UserController.java
package org.nafmii.app.controller; package org.nafmii.app.user.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.nafmii.app.service.UserService; import org.nafmii.app.user.dto.LoginDto;
import org.nafmii.app.dto.user.LoginDto; import org.nafmii.app.user.dto.RegisterDto;
import org.nafmii.app.dto.user.RegisterDto; import org.nafmii.app.user.service.UserService;
import org.nafmii.app.user.vo.UserVO;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.nafmii.app.vo.UserVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
......
nafmii-app/src/main/java/org/nafmii/app/user/dao/AppUserMapper.java 0 → 100644
package org.nafmii.app.user.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.nafmii.app.user.dto.LoginDto;
import org.nafmii.app.user.entity.AppUserPO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nafmii.app.user.vo.UserVO;
import java.util.List;
/**
* <p>
* APP用户表 Mapper 接口
* </p>
*
* @author zjh
* @since 2021-04-27
*/
@Mapper
public interface AppUserMapper extends BaseMapper<AppUserPO> {
List<UserVO> selectByPassword(LoginDto loginDto);
List<UserVO> selectByPhone(@Param("phone") String phone);
}
nafmii-app/src/main/java/org/nafmii/app/dto/user/LoginDto.java → nafmii-app/src/main/java/org/nafmii/app/user/dto/LoginDto.java
package org.nafmii.app.dto.user; package org.nafmii.app.user.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
nafmii-app/src/main/java/org/nafmii/user/dto/user/RegisterDto.java → nafmii-app/src/main/java/org/nafmii/app/user/dto/RegisterDto.java
package org.nafmii.user.dto.user; package org.nafmii.app.user.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
nafmii-app/src/main/java/org/nafmii/user/vo/UserVO.java → nafmii-app/src/main/java/org/nafmii/app/user/entity/AppUserPO.java
package org.nafmii.user.vo; package org.nafmii.app.user.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date; import lombok.experimental.Accessors;
/** /**
* @author:zhoujh * <p>
* @Function:TODO * APP用户表
* @date 2021/4/25 10:22 * </p>
* @ClassName: *
* @version: * @author zjh
* @remark: * @since 2021-04-27
*/ */
@Data @Data
@ApiModel("用户返回报文") @EqualsAndHashCode(callSuper = true)
public class UserVO { @Accessors(chain = true)
@TableName("APP_USER")
@ApiModel(value="AppUserPO对象", description="APP用户表")
public class AppUserPO extends Model {
private static final long serialVersionUID=1L;
@TableId("ID")
private Long id; private Long id;
@ApiModelProperty(value = "昵称") @ApiModelProperty(value = "昵称")
@TableField("USER_NAME")
private String userName; private String userName;
@ApiModelProperty(value = "登录密码") @ApiModelProperty(value = "登录密码")
@TableField("LOGIN_PWD")
private String loginPwd; private String loginPwd;
@ApiModelProperty(value = "中文姓名") @ApiModelProperty(value = "中文姓名")
@TableField("REAL_NAME")
private String realName; private String realName;
@ApiModelProperty(value = "手机号/登录账号") @ApiModelProperty(value = "手机号/登录账号")
@TableField("PHONE")
private String phone; private String phone;
@ApiModelProperty(value = "出生日期") @ApiModelProperty(value = "出生日期 示例：2020-10-10")
@TableField("BIRTHDAY")
private String birthday; private String birthday;
@ApiModelProperty(value = "邮箱") @ApiModelProperty(value = "邮箱")
@TableField("EMAIL")
private String email; private String email;
@ApiModelProperty(value = "头像图片地址") @ApiModelProperty(value = "头像图片地址")
@TableField("HEAD_PICTURE")
private String headPicture; private String headPicture;
@ApiModelProperty(value = "国籍") @ApiModelProperty(value = "国籍")
@TableField("NATIONALITY")
private String nationality; private String nationality;
@ApiModelProperty(value = "单位全称") @ApiModelProperty(value = "单位全称")
@TableField("UNIT_NAME")
private String unitName; private String unitName;
@ApiModelProperty(value = "微信OPENT_ID") @ApiModelProperty(value = "微信OPENT_ID")
@TableField("OPEN_ID")
private String openId; private String openId;
@ApiModelProperty(value = "是否开启指纹登录 0 未开启 1 已开启") @ApiModelProperty(value = "是否开启指纹登录 0 未开启 1 已开启")
@TableField("FIGERPRINT_FALG")
private String figerprintFalg; private String figerprintFalg;
@ApiModelProperty(value = "是否开启人脸识别登录 0 未开启 1 已开启") @ApiModelProperty(value = "是否开启人脸识别登录 0 未开启 1 已开启")
@TableField("FACEID_FALG")
private String faceidFalg; private String faceidFalg;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Date createTime; @TableField("CREATE_TIME")
private LocalDateTime createTime;
@ApiModelProperty(value = "更新时间") @ApiModelProperty(value = "更新时间")
private Date updateTime; @TableField("UPDATE_TIME")
private LocalDateTime updateTime;
@ApiModelProperty(value = "是否有效标识 0 有效用户 1无效用户") @ApiModelProperty(value = "是否有效标识 0 有效用户 1无效用户")
@TableField("IS_ENABLE")
private String isEnable; private String isEnable;
@ApiModelProperty(value = "token")
private String token;
} }
nafmii-app/src/main/java/org/nafmii/app/service/AppService.java → nafmii-app/src/main/java/org/nafmii/app/user/service/AppService.java
package org.nafmii.app.service; package org.nafmii.app.user.service;
/** /**
* @author:zhoujh * @author:zhoujh
......
nafmii-app/src/main/java/org/nafmii/app/service/UserService.java → nafmii-app/src/main/java/org/nafmii/app/user/service/UserService.java
package org.nafmii.app.service; package org.nafmii.app.user.service;
import org.nafmii.app.dto.user.LoginDto; import org.nafmii.app.user.dto.LoginDto;
import org.nafmii.app.dto.user.RegisterDto; import org.nafmii.app.user.dto.RegisterDto;
import org.nafmii.app.user.vo.UserVO;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.nafmii.app.vo.UserVO;
/** /**
* @author:zhoujh * @author:zhoujh
......
nafmii-app/src/main/java/org/nafmii/app/service/impl/AppServiceImpl.java → nafmii-app/src/main/java/org/nafmii/app/user/service/impl/AppServiceImpl.java
package org.nafmii.app.service.impl; package org.nafmii.app.user.service.impl;
import org.nafmii.app.feignservice.AdminService;
import org.nafmii.app.service.AppService; import org.nafmii.app.feign.AdminService;
import org.nafmii.app.user.service.AppService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
nafmii-app/src/main/java/org/nafmii/app/service/impl/UserServiceImpl.java → nafmii-app/src/main/java/org/nafmii/app/user/service/impl/UserServiceImpl.java
package org.nafmii.app.service.impl; package org.nafmii.app.user.service.impl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nafmii.app.dto.user.LoginDto; import org.nafmii.app.user.dao.AppUserMapper;
import org.nafmii.app.dto.user.RegisterDto; import org.nafmii.app.user.dto.LoginDto;
import org.nafmii.app.entity.user.AppUser; import org.nafmii.app.user.dto.RegisterDto;
import org.nafmii.app.enums.UserEnum; import org.nafmii.app.user.entity.AppUserPO;
import org.nafmii.app.user.service.UserService;
import org.nafmii.app.user.vo.UserAndRoleVo;
import org.nafmii.app.user.vo.UserVO;
import org.nafmii.common.exception.BusinessException; import org.nafmii.common.exception.BusinessException;
import org.nafmii.app.mapper.user.AppUserMapper;
import org.nafmii.common.response.ApiResponse; import org.nafmii.common.response.ApiResponse;
import org.nafmii.app.service.UserService;
import org.nafmii.common.utils.GuavaUtil; import org.nafmii.common.utils.GuavaUtil;
import org.nafmii.common.utils.JwtUtils; import org.nafmii.common.utils.JwtUtils;
import org.nafmii.common.utils.SnowFlakeUtil; import org.nafmii.common.utils.SnowFlakeUtil;
import org.nafmii.app.vo.UserAndRoleVo; import org.nafmii.enums.UserEnum;
import org.nafmii.app.vo.UserVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -78,7 +78,7 @@ public class UserServiceImpl implements UserService { ...@@ -78,7 +78,7 @@ public class UserServiceImpl implements UserService {
@Override @Override
public ApiResponse register(RegisterDto registerDto) { public ApiResponse register(RegisterDto registerDto) {
//用户实体类 //用户实体类
AppUser appUser = new AppUser(); AppUserPO appUser = new AppUserPO();
appUser.setId(SnowFlakeUtil.nextId()); appUser.setId(SnowFlakeUtil.nextId());
appUser.setFaceidFalg(UserEnum.NOTFACE.getCode()); appUser.setFaceidFalg(UserEnum.NOTFACE.getCode());
appUser.setFigerprintFalg(UserEnum.NOTFINGERPRINT.getCode()); appUser.setFigerprintFalg(UserEnum.NOTFINGERPRINT.getCode());
...@@ -90,8 +90,12 @@ public class UserServiceImpl implements UserService { ...@@ -90,8 +90,12 @@ public class UserServiceImpl implements UserService {
throw new BusinessException("两次密码输入不相同，请再次输入"); throw new BusinessException("两次密码输入不相同，请再次输入");
} }
appUser.setLoginPwd(registerDto.getLoginPwd()); appUser.setLoginPwd(registerDto.getLoginPwd());
appUser.setCreateTime(new Date()); //格式化格式
appUser.setUpdateTime(new Date()); String format = "YYYY-MM-dd hh:mm:ss";
// DateTimeFormatter.ofPattern方法根据指定的格式输出时间
String formatDateTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern(format));
// appUser.setCreateTime(formatDateTime);
// appUser.setUpdateTime(new Date());
log.info("用户注册参数==============>"+registerDto); log.info("用户注册参数==============>"+registerDto);
//将验证码放入到缓存当中(过期时间60s)test //将验证码放入到缓存当中(过期时间60s)test
// GuavaUtil.putTrackGuava(registerDto.getPhone(),registerDto.getCode()); // GuavaUtil.putTrackGuava(registerDto.getPhone(),registerDto.getCode());
...@@ -105,7 +109,7 @@ public class UserServiceImpl implements UserService { ...@@ -105,7 +109,7 @@ public class UserServiceImpl implements UserService {
throw new BusinessException("验证码错误请重新输入"); throw new BusinessException("验证码错误请重新输入");
} }
int i = appUserMapper.insertSelective(appUser); int i = appUserMapper.insert(appUser);
if (i<0){ if (i<0){
return new ApiResponse().fail("新增失败"); return new ApiResponse().fail("新增失败");
} }
......
nafmii-app/src/main/java/org/nafmii/user/service/AppService.java → nafmii-app/src/main/java/org/nafmii/app/user/test.java
package org.nafmii.user.service; package org.nafmii.app.user;
/** /**
* @author:zhoujh * @author:zhoujh
* @Function:TODO * @Function:TODO
* @date 2021/4/27 9:50 * @date 2021/4/27 10:54
* @ClassName: * @ClassName:
* @version: * @version:
* @remark: * @remark:
*/ */
public interface AppService { public class test {
//test
String search();
} }
nafmii-app/src/main/java/org/nafmii/app/vo/UserAndRoleVo.java → nafmii-app/src/main/java/org/nafmii/app/user/vo/UserAndRoleVo.java
package org.nafmii.app.vo; package org.nafmii.app.user.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
......
nafmii-app/src/main/java/org/nafmii/app/vo/UserVO.java → nafmii-app/src/main/java/org/nafmii/app/user/vo/UserVO.java
package org.nafmii.app.vo; package org.nafmii.app.user.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author:zhoujh * @author:zhoujh
......
nafmii-app/src/main/java/org/nafmii/user/controller/AppController.java deleted 100644 → 0
package org.nafmii.user.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nafmii.user.service.AppService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/22 9:08
* @ClassName:
* @version:
* @remark:
*/
@RestController
@RequestMapping("app/nafmii/test/")
@Api(tags = "2.0.0", description = "测试")
public class AppController {
@Autowired
private AppService appService;
@ApiOperation( value = "测试",notes = "测试")
@GetMapping("search")
public String search(){
String test = appService.search();
return test;
}
}
nafmii-app/src/main/java/org/nafmii/user/controller/UserController.java deleted 100644 → 0
package org.nafmii.user.controller;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.nafmii.user.dto.user.LoginDto;
import org.nafmii.user.dto.user.RegisterDto;
import org.nafmii.response.ApiResponse;
import org.nafmii.user.service.UserService;
import org.nafmii.user.vo.UserVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/25 10:10
* @ClassName:
* @version:
* @remark:
*/
@RestController
@RequestMapping("app/nafmii/user")
@Api(tags = "2.0.0", description = "用户登陆注册操作操作【zjh】")
public class UserController {
@Autowired
private UserService userService;
@ApiOperation( value = "模拟用户登陆",notes = "模拟用户登陆")
@PostMapping("/loginTest")
@ResponseBody
public ApiResponse<UserVO> loginTest (){
ApiResponse<UserVO> login = userService.login();
return login;
}
@ApiOperation( value = "app用户注册接口",notes = "app用户注册接口")
@PostMapping("/register")
@ResponseBody
public ApiResponse register (@RequestBody RegisterDto registerDto){
ApiResponse register = userService.register(registerDto);
return register;
}
@ApiOperation( value = "app用户登陆接口（密码加验证码）",notes = "app用户登陆接口（密码加验证码）")
@PostMapping("/userLogin")
@ResponseBody
public ApiResponse<UserVO> login (@RequestBody LoginDto loginDto){
ApiResponse<UserVO> login = userService.userLogin(loginDto);
return login;
}
}
nafmii-app/src/main/java/org/nafmii/user/dto/user/LoginDto.java deleted 100644 → 0
package org.nafmii.user.dto.user;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/26 16:41
* @ClassName:
* @version:
* @remark:
*/
@Data
@ApiModel("app用户登陆参数对象")
public class LoginDto {
@NotNull(message = "手机号或登录账号不能为空")
@ApiModelProperty("手机号/登录账号")
private String phone;
@NotNull(message = "注册密码不能为空")
@ApiModelProperty("登陆密码")
private String loginPwd;
@NotNull(message = "验证码不能为空")
@ApiModelProperty("验证码")
private String code;
@NotNull(message = "登陆方式不能为空")
@ApiModelProperty("登陆方式0密码1验证码")
private String type;
}
nafmii-app/src/main/java/org/nafmii/user/mapper/user/AppUserMapper.java deleted 100644 → 0
package org.nafmii.user.mapper.user;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.nafmii.user.dto.user.LoginDto;
import org.nafmii.user.po.user.AppUser;
import org.nafmii.user.po.user.AppUserExample;
import org.nafmii.user.vo.UserVO;
import java.util.List;
@Mapper
public interface AppUserMapper {
long countByExample(AppUserExample example);
int deleteByExample(AppUserExample example);
int deleteByPrimaryKey(Long id);
int insert(AppUser record);
int insertSelective(AppUser record);
List<AppUser> selectByExample(AppUserExample example);
UserVO selectByPassword(LoginDto loginDto);
UserVO selectByPhone(@Param("phone") String phone);
AppUser selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") AppUser record, @Param("example") AppUserExample example);
int updateByExample(@Param("record") AppUser record, @Param("example") AppUserExample example);
int updateByPrimaryKeySelective(AppUser record);
int updateByPrimaryKey(AppUser record);
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/user/po/user/AppUser.java deleted 100644 → 0
package org.nafmii.user.po.user;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
public class AppUser implements Serializable {
private Long id;
@ApiModelProperty(value = "昵称")
private String userName;
@ApiModelProperty(value = "登录密码")
private String loginPwd;
@ApiModelProperty(value = "中文姓名")
private String realName;
@ApiModelProperty(value = "手机号/登录账号")
private String phone;
@ApiModelProperty(value = "出生日期")
private String birthday;
@ApiModelProperty(value = "邮箱")
private String email;
@ApiModelProperty(value = "头像图片地址")
private String headPicture;
@ApiModelProperty(value = "国籍")
private String nationality;
@ApiModelProperty(value = "单位全称")
private String unitName;
@ApiModelProperty(value = "微信OPENT_ID")
private String openId;
@ApiModelProperty(value = "是否开启指纹登录 0 未开启 1 已开启")
private String figerprintFalg;
@ApiModelProperty(value = "是否开启人脸识别登录 0 未开启 1 已开启")
private String faceidFalg;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "更新时间")
private Date updateTime;
@ApiModelProperty(value = "是否有效标识 0 有效用户 1无效用户")
private String isEnable;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
public String getLoginPwd() {
return loginPwd;
}
public void setLoginPwd(String loginPwd) {
this.loginPwd = loginPwd;
}
public String getRealName() {
return realName;
}
public void setRealName(String realName) {
this.realName = realName;
}
public String getPhone() {
return phone;
}
public void setPhone(String phone) {
this.phone = phone;
}
public String getBirthday() {
return birthday;
}
public void setBirthday(String birthday) {
this.birthday = birthday;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getHeadPicture() {
return headPicture;
}
public void setHeadPicture(String headPicture) {
this.headPicture = headPicture;
}
public String getNationality() {
return nationality;
}
public void setNationality(String nationality) {
this.nationality = nationality;
}
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public String getOpenId() {
return openId;
}
public void setOpenId(String openId) {
this.openId = openId;
}
public String getFigerprintFalg() {
return figerprintFalg;
}
public void setFigerprintFalg(String figerprintFalg) {
this.figerprintFalg = figerprintFalg;
}
public String getFaceidFalg() {
return faceidFalg;
}
public void setFaceidFalg(String faceidFalg) {
this.faceidFalg = faceidFalg;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getUpdateTime() {
return updateTime;
}
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
public String getIsEnable() {
return isEnable;
}
public void setIsEnable(String isEnable) {
this.isEnable = isEnable;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", userName=").append(userName);
sb.append(", loginPwd=").append(loginPwd);
sb.append(", realName=").append(realName);
sb.append(", phone=").append(phone);
sb.append(", birthday=").append(birthday);
sb.append(", email=").append(email);
sb.append(", headPicture=").append(headPicture);
sb.append(", nationality=").append(nationality);
sb.append(", unitName=").append(unitName);
sb.append(", openId=").append(openId);
sb.append(", figerprintFalg=").append(figerprintFalg);
sb.append(", faceidFalg=").append(faceidFalg);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", isEnable=").append(isEnable);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/user/po/user/AppUserExample.java deleted 100644 → 0
package org.nafmii.user.po.user;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class AppUserExample {
protected String orderByClause;
protected boolean distinct;
protected List<Criteria> oredCriteria;
public AppUserExample() {
oredCriteria = new ArrayList<>();
}
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
public String getOrderByClause() {
return orderByClause;
}
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
public boolean isDistinct() {
return distinct;
}
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("ID is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("ID is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("ID =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("ID <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("ID >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("ID >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("ID <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("ID <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("ID not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("ID between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("ID not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andUserNameIsNull() {
addCriterion("USER_NAME is null");
return (Criteria) this;
}
public Criteria andUserNameIsNotNull() {
addCriterion("USER_NAME is not null");
return (Criteria) this;
}
public Criteria andUserNameEqualTo(String value) {
addCriterion("USER_NAME =", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotEqualTo(String value) {
addCriterion("USER_NAME <>", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThan(String value) {
addCriterion("USER_NAME >", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameGreaterThanOrEqualTo(String value) {
addCriterion("USER_NAME >=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThan(String value) {
addCriterion("USER_NAME <", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLessThanOrEqualTo(String value) {
addCriterion("USER_NAME <=", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameLike(String value) {
addCriterion("USER_NAME like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotLike(String value) {
addCriterion("USER_NAME not like", value, "userName");
return (Criteria) this;
}
public Criteria andUserNameIn(List<String> values) {
addCriterion("USER_NAME in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotIn(List<String> values) {
addCriterion("USER_NAME not in", values, "userName");
return (Criteria) this;
}
public Criteria andUserNameBetween(String value1, String value2) {
addCriterion("USER_NAME between", value1, value2, "userName");
return (Criteria) this;
}
public Criteria andUserNameNotBetween(String value1, String value2) {
addCriterion("USER_NAME not between", value1, value2, "userName");
return (Criteria) this;
}
public Criteria andLoginPwdIsNull() {
addCriterion("LOGIN_PWD is null");
return (Criteria) this;
}
public Criteria andLoginPwdIsNotNull() {
addCriterion("LOGIN_PWD is not null");
return (Criteria) this;
}
public Criteria andLoginPwdEqualTo(String value) {
addCriterion("LOGIN_PWD =", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotEqualTo(String value) {
addCriterion("LOGIN_PWD <>", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdGreaterThan(String value) {
addCriterion("LOGIN_PWD >", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdGreaterThanOrEqualTo(String value) {
addCriterion("LOGIN_PWD >=", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdLessThan(String value) {
addCriterion("LOGIN_PWD <", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdLessThanOrEqualTo(String value) {
addCriterion("LOGIN_PWD <=", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdLike(String value) {
addCriterion("LOGIN_PWD like", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotLike(String value) {
addCriterion("LOGIN_PWD not like", value, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdIn(List<String> values) {
addCriterion("LOGIN_PWD in", values, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotIn(List<String> values) {
addCriterion("LOGIN_PWD not in", values, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdBetween(String value1, String value2) {
addCriterion("LOGIN_PWD between", value1, value2, "loginPwd");
return (Criteria) this;
}
public Criteria andLoginPwdNotBetween(String value1, String value2) {
addCriterion("LOGIN_PWD not between", value1, value2, "loginPwd");
return (Criteria) this;
}
public Criteria andRealNameIsNull() {
addCriterion("REAL_NAME is null");
return (Criteria) this;
}
public Criteria andRealNameIsNotNull() {
addCriterion("REAL_NAME is not null");
return (Criteria) this;
}
public Criteria andRealNameEqualTo(String value) {
addCriterion("REAL_NAME =", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotEqualTo(String value) {
addCriterion("REAL_NAME <>", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameGreaterThan(String value) {
addCriterion("REAL_NAME >", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameGreaterThanOrEqualTo(String value) {
addCriterion("REAL_NAME >=", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameLessThan(String value) {
addCriterion("REAL_NAME <", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameLessThanOrEqualTo(String value) {
addCriterion("REAL_NAME <=", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameLike(String value) {
addCriterion("REAL_NAME like", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotLike(String value) {
addCriterion("REAL_NAME not like", value, "realName");
return (Criteria) this;
}
public Criteria andRealNameIn(List<String> values) {
addCriterion("REAL_NAME in", values, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotIn(List<String> values) {
addCriterion("REAL_NAME not in", values, "realName");
return (Criteria) this;
}
public Criteria andRealNameBetween(String value1, String value2) {
addCriterion("REAL_NAME between", value1, value2, "realName");
return (Criteria) this;
}
public Criteria andRealNameNotBetween(String value1, String value2) {
addCriterion("REAL_NAME not between", value1, value2, "realName");
return (Criteria) this;
}
public Criteria andPhoneIsNull() {
addCriterion("PHONE is null");
return (Criteria) this;
}
public Criteria andPhoneIsNotNull() {
addCriterion("PHONE is not null");
return (Criteria) this;
}
public Criteria andPhoneEqualTo(String value) {
addCriterion("PHONE =", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotEqualTo(String value) {
addCriterion("PHONE <>", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneGreaterThan(String value) {
addCriterion("PHONE >", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneGreaterThanOrEqualTo(String value) {
addCriterion("PHONE >=", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneLessThan(String value) {
addCriterion("PHONE <", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneLessThanOrEqualTo(String value) {
addCriterion("PHONE <=", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneLike(String value) {
addCriterion("PHONE like", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotLike(String value) {
addCriterion("PHONE not like", value, "phone");
return (Criteria) this;
}
public Criteria andPhoneIn(List<String> values) {
addCriterion("PHONE in", values, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotIn(List<String> values) {
addCriterion("PHONE not in", values, "phone");
return (Criteria) this;
}
public Criteria andPhoneBetween(String value1, String value2) {
addCriterion("PHONE between", value1, value2, "phone");
return (Criteria) this;
}
public Criteria andPhoneNotBetween(String value1, String value2) {
addCriterion("PHONE not between", value1, value2, "phone");
return (Criteria) this;
}
public Criteria andBirthdayIsNull() {
addCriterion("BIRTHDAY is null");
return (Criteria) this;
}
public Criteria andBirthdayIsNotNull() {
addCriterion("BIRTHDAY is not null");
return (Criteria) this;
}
public Criteria andBirthdayEqualTo(String value) {
addCriterion("BIRTHDAY =", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotEqualTo(String value) {
addCriterion("BIRTHDAY <>", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayGreaterThan(String value) {
addCriterion("BIRTHDAY >", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayGreaterThanOrEqualTo(String value) {
addCriterion("BIRTHDAY >=", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayLessThan(String value) {
addCriterion("BIRTHDAY <", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayLessThanOrEqualTo(String value) {
addCriterion("BIRTHDAY <=", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayLike(String value) {
addCriterion("BIRTHDAY like", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotLike(String value) {
addCriterion("BIRTHDAY not like", value, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayIn(List<String> values) {
addCriterion("BIRTHDAY in", values, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotIn(List<String> values) {
addCriterion("BIRTHDAY not in", values, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayBetween(String value1, String value2) {
addCriterion("BIRTHDAY between", value1, value2, "birthday");
return (Criteria) this;
}
public Criteria andBirthdayNotBetween(String value1, String value2) {
addCriterion("BIRTHDAY not between", value1, value2, "birthday");
return (Criteria) this;
}
public Criteria andEmailIsNull() {
addCriterion("EMAIL is null");
return (Criteria) this;
}
public Criteria andEmailIsNotNull() {
addCriterion("EMAIL is not null");
return (Criteria) this;
}
public Criteria andEmailEqualTo(String value) {
addCriterion("EMAIL =", value, "email");
return (Criteria) this;
}
public Criteria andEmailNotEqualTo(String value) {
addCriterion("EMAIL <>", value, "email");
return (Criteria) this;
}
public Criteria andEmailGreaterThan(String value) {
addCriterion("EMAIL >", value, "email");
return (Criteria) this;
}
public Criteria andEmailGreaterThanOrEqualTo(String value) {
addCriterion("EMAIL >=", value, "email");
return (Criteria) this;
}
public Criteria andEmailLessThan(String value) {
addCriterion("EMAIL <", value, "email");
return (Criteria) this;
}
public Criteria andEmailLessThanOrEqualTo(String value) {
addCriterion("EMAIL <=", value, "email");
return (Criteria) this;
}
public Criteria andEmailLike(String value) {
addCriterion("EMAIL like", value, "email");
return (Criteria) this;
}
public Criteria andEmailNotLike(String value) {
addCriterion("EMAIL not like", value, "email");
return (Criteria) this;
}
public Criteria andEmailIn(List<String> values) {
addCriterion("EMAIL in", values, "email");
return (Criteria) this;
}
public Criteria andEmailNotIn(List<String> values) {
addCriterion("EMAIL not in", values, "email");
return (Criteria) this;
}
public Criteria andEmailBetween(String value1, String value2) {
addCriterion("EMAIL between", value1, value2, "email");
return (Criteria) this;
}
public Criteria andEmailNotBetween(String value1, String value2) {
addCriterion("EMAIL not between", value1, value2, "email");
return (Criteria) this;
}
public Criteria andHeadPictureIsNull() {
addCriterion("HEAD_PICTURE is null");
return (Criteria) this;
}
public Criteria andHeadPictureIsNotNull() {
addCriterion("HEAD_PICTURE is not null");
return (Criteria) this;
}
public Criteria andHeadPictureEqualTo(String value) {
addCriterion("HEAD_PICTURE =", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotEqualTo(String value) {
addCriterion("HEAD_PICTURE <>", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureGreaterThan(String value) {
addCriterion("HEAD_PICTURE >", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureGreaterThanOrEqualTo(String value) {
addCriterion("HEAD_PICTURE >=", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureLessThan(String value) {
addCriterion("HEAD_PICTURE <", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureLessThanOrEqualTo(String value) {
addCriterion("HEAD_PICTURE <=", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureLike(String value) {
addCriterion("HEAD_PICTURE like", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotLike(String value) {
addCriterion("HEAD_PICTURE not like", value, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureIn(List<String> values) {
addCriterion("HEAD_PICTURE in", values, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotIn(List<String> values) {
addCriterion("HEAD_PICTURE not in", values, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureBetween(String value1, String value2) {
addCriterion("HEAD_PICTURE between", value1, value2, "headPicture");
return (Criteria) this;
}
public Criteria andHeadPictureNotBetween(String value1, String value2) {
addCriterion("HEAD_PICTURE not between", value1, value2, "headPicture");
return (Criteria) this;
}
public Criteria andNationalityIsNull() {
addCriterion("NATIONALITY is null");
return (Criteria) this;
}
public Criteria andNationalityIsNotNull() {
addCriterion("NATIONALITY is not null");
return (Criteria) this;
}
public Criteria andNationalityEqualTo(String value) {
addCriterion("NATIONALITY =", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotEqualTo(String value) {
addCriterion("NATIONALITY <>", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityGreaterThan(String value) {
addCriterion("NATIONALITY >", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityGreaterThanOrEqualTo(String value) {
addCriterion("NATIONALITY >=", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityLessThan(String value) {
addCriterion("NATIONALITY <", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityLessThanOrEqualTo(String value) {
addCriterion("NATIONALITY <=", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityLike(String value) {
addCriterion("NATIONALITY like", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotLike(String value) {
addCriterion("NATIONALITY not like", value, "nationality");
return (Criteria) this;
}
public Criteria andNationalityIn(List<String> values) {
addCriterion("NATIONALITY in", values, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotIn(List<String> values) {
addCriterion("NATIONALITY not in", values, "nationality");
return (Criteria) this;
}
public Criteria andNationalityBetween(String value1, String value2) {
addCriterion("NATIONALITY between", value1, value2, "nationality");
return (Criteria) this;
}
public Criteria andNationalityNotBetween(String value1, String value2) {
addCriterion("NATIONALITY not between", value1, value2, "nationality");
return (Criteria) this;
}
public Criteria andUnitNameIsNull() {
addCriterion("UNIT_NAME is null");
return (Criteria) this;
}
public Criteria andUnitNameIsNotNull() {
addCriterion("UNIT_NAME is not null");
return (Criteria) this;
}
public Criteria andUnitNameEqualTo(String value) {
addCriterion("UNIT_NAME =", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotEqualTo(String value) {
addCriterion("UNIT_NAME <>", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameGreaterThan(String value) {
addCriterion("UNIT_NAME >", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameGreaterThanOrEqualTo(String value) {
addCriterion("UNIT_NAME >=", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameLessThan(String value) {
addCriterion("UNIT_NAME <", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameLessThanOrEqualTo(String value) {
addCriterion("UNIT_NAME <=", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameLike(String value) {
addCriterion("UNIT_NAME like", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotLike(String value) {
addCriterion("UNIT_NAME not like", value, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameIn(List<String> values) {
addCriterion("UNIT_NAME in", values, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotIn(List<String> values) {
addCriterion("UNIT_NAME not in", values, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameBetween(String value1, String value2) {
addCriterion("UNIT_NAME between", value1, value2, "unitName");
return (Criteria) this;
}
public Criteria andUnitNameNotBetween(String value1, String value2) {
addCriterion("UNIT_NAME not between", value1, value2, "unitName");
return (Criteria) this;
}
public Criteria andOpenIdIsNull() {
addCriterion("OPEN_ID is null");
return (Criteria) this;
}
public Criteria andOpenIdIsNotNull() {
addCriterion("OPEN_ID is not null");
return (Criteria) this;
}
public Criteria andOpenIdEqualTo(String value) {
addCriterion("OPEN_ID =", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotEqualTo(String value) {
addCriterion("OPEN_ID <>", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdGreaterThan(String value) {
addCriterion("OPEN_ID >", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
addCriterion("OPEN_ID >=", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdLessThan(String value) {
addCriterion("OPEN_ID <", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdLessThanOrEqualTo(String value) {
addCriterion("OPEN_ID <=", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdLike(String value) {
addCriterion("OPEN_ID like", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotLike(String value) {
addCriterion("OPEN_ID not like", value, "openId");
return (Criteria) this;
}
public Criteria andOpenIdIn(List<String> values) {
addCriterion("OPEN_ID in", values, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotIn(List<String> values) {
addCriterion("OPEN_ID not in", values, "openId");
return (Criteria) this;
}
public Criteria andOpenIdBetween(String value1, String value2) {
addCriterion("OPEN_ID between", value1, value2, "openId");
return (Criteria) this;
}
public Criteria andOpenIdNotBetween(String value1, String value2) {
addCriterion("OPEN_ID not between", value1, value2, "openId");
return (Criteria) this;
}
public Criteria andFigerprintFalgIsNull() {
addCriterion("FIGERPRINT_FALG is null");
return (Criteria) this;
}
public Criteria andFigerprintFalgIsNotNull() {
addCriterion("FIGERPRINT_FALG is not null");
return (Criteria) this;
}
public Criteria andFigerprintFalgEqualTo(String value) {
addCriterion("FIGERPRINT_FALG =", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotEqualTo(String value) {
addCriterion("FIGERPRINT_FALG <>", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgGreaterThan(String value) {
addCriterion("FIGERPRINT_FALG >", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgGreaterThanOrEqualTo(String value) {
addCriterion("FIGERPRINT_FALG >=", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgLessThan(String value) {
addCriterion("FIGERPRINT_FALG <", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgLessThanOrEqualTo(String value) {
addCriterion("FIGERPRINT_FALG <=", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgLike(String value) {
addCriterion("FIGERPRINT_FALG like", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotLike(String value) {
addCriterion("FIGERPRINT_FALG not like", value, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgIn(List<String> values) {
addCriterion("FIGERPRINT_FALG in", values, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotIn(List<String> values) {
addCriterion("FIGERPRINT_FALG not in", values, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgBetween(String value1, String value2) {
addCriterion("FIGERPRINT_FALG between", value1, value2, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFigerprintFalgNotBetween(String value1, String value2) {
addCriterion("FIGERPRINT_FALG not between", value1, value2, "figerprintFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgIsNull() {
addCriterion("FACEID_FALG is null");
return (Criteria) this;
}
public Criteria andFaceidFalgIsNotNull() {
addCriterion("FACEID_FALG is not null");
return (Criteria) this;
}
public Criteria andFaceidFalgEqualTo(String value) {
addCriterion("FACEID_FALG =", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotEqualTo(String value) {
addCriterion("FACEID_FALG <>", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgGreaterThan(String value) {
addCriterion("FACEID_FALG >", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgGreaterThanOrEqualTo(String value) {
addCriterion("FACEID_FALG >=", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgLessThan(String value) {
addCriterion("FACEID_FALG <", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgLessThanOrEqualTo(String value) {
addCriterion("FACEID_FALG <=", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgLike(String value) {
addCriterion("FACEID_FALG like", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotLike(String value) {
addCriterion("FACEID_FALG not like", value, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgIn(List<String> values) {
addCriterion("FACEID_FALG in", values, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotIn(List<String> values) {
addCriterion("FACEID_FALG not in", values, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgBetween(String value1, String value2) {
addCriterion("FACEID_FALG between", value1, value2, "faceidFalg");
return (Criteria) this;
}
public Criteria andFaceidFalgNotBetween(String value1, String value2) {
addCriterion("FACEID_FALG not between", value1, value2, "faceidFalg");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("CREATE_TIME is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("CREATE_TIME is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("CREATE_TIME =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("CREATE_TIME <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("CREATE_TIME >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("CREATE_TIME <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("CREATE_TIME in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("CREATE_TIME not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("UPDATE_TIME is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("UPDATE_TIME is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("UPDATE_TIME =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("UPDATE_TIME <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("UPDATE_TIME >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("UPDATE_TIME >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("UPDATE_TIME <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("UPDATE_TIME <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("UPDATE_TIME in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("UPDATE_TIME not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andIsEnableIsNull() {
addCriterion("IS_ENABLE is null");
return (Criteria) this;
}
public Criteria andIsEnableIsNotNull() {
addCriterion("IS_ENABLE is not null");
return (Criteria) this;
}
public Criteria andIsEnableEqualTo(String value) {
addCriterion("IS_ENABLE =", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotEqualTo(String value) {
addCriterion("IS_ENABLE <>", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableGreaterThan(String value) {
addCriterion("IS_ENABLE >", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableGreaterThanOrEqualTo(String value) {
addCriterion("IS_ENABLE >=", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableLessThan(String value) {
addCriterion("IS_ENABLE <", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableLessThanOrEqualTo(String value) {
addCriterion("IS_ENABLE <=", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableLike(String value) {
addCriterion("IS_ENABLE like", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotLike(String value) {
addCriterion("IS_ENABLE not like", value, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableIn(List<String> values) {
addCriterion("IS_ENABLE in", values, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotIn(List<String> values) {
addCriterion("IS_ENABLE not in", values, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableBetween(String value1, String value2) {
addCriterion("IS_ENABLE between", value1, value2, "isEnable");
return (Criteria) this;
}
public Criteria andIsEnableNotBetween(String value1, String value2) {
addCriterion("IS_ENABLE not between", value1, value2, "isEnable");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file \ No newline at end of file
nafmii-app/src/main/java/org/nafmii/user/service/UserService.java deleted 100644 → 0
package org.nafmii.user.service;
import org.nafmii.response.ApiResponse;
import org.nafmii.user.dto.user.LoginDto;
import org.nafmii.user.dto.user.RegisterDto;
import org.nafmii.user.vo.UserVO;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/27 9:53
* @ClassName:
* @version:
* @remark:
*/
public interface UserService {
//模拟用户登陆接口
ApiResponse<UserVO> login();
//app注册接口
ApiResponse register(RegisterDto registerDto);
//用户登陆接口
ApiResponse<UserVO> userLogin(LoginDto loginDto);
}
nafmii-app/src/main/java/org/nafmii/user/service/impl/AppServiceImpl.java deleted 100644 → 0
package org.nafmii.user.service.impl;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/27 9:51
* @ClassName:
* @version:
* @remark:
*/
import org.nafmii.feign.AdminService;
import org.nafmii.user.service.AppService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/22 9:30
* @ClassName:
* @version:
* @remark:
*/
@Service
public class AppServiceImpl implements AppService {
@Autowired
private AdminService adminService;
@Override
public String search() {
String search = adminService.search();
return search;
}
}
nafmii-app/src/main/java/org/nafmii/user/service/impl/UserServiceImpl.java deleted 100644 → 0
package org.nafmii.user.service.impl;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/27 9:54
* @ClassName:
* @version:
* @remark:
*/
import lombok.extern.slf4j.Slf4j;
import org.nafmii.enums.UserEnum;
import org.nafmii.exception.BusinessException;
import org.nafmii.response.ApiResponse;
import org.nafmii.user.dto.user.LoginDto;
import org.nafmii.user.dto.user.RegisterDto;
import org.nafmii.user.mapper.user.AppUserMapper;
import org.nafmii.user.po.user.AppUser;
import org.nafmii.user.service.UserService;
import org.nafmii.user.vo.UserAndRoleVo;
import org.nafmii.user.vo.UserVO;
import org.nafmii.utils.GuavaUtil;
import org.nafmii.utils.JwtUtils;
import org.nafmii.utils.SnowFlakeUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/25 10:20
* @ClassName:app用户实现类
* @version:
* @remark:
*/
@Service
@Slf4j
public class UserServiceImpl implements UserService {
@Resource
private AppUserMapper appUserMapper;
/**
* 模拟用户登陆
* @return
*/
@Override
public ApiResponse<UserVO> login() {
ApiResponse result = new ApiResponse();
//假设验证数据通过
UserVO userVO = new UserVO();
userVO.setLoginPwd("zzz");
userVO.setUserName("zzz");
List<UserAndRoleVo> roleList =new ArrayList<>();
UserAndRoleVo roleVo = new UserAndRoleVo();
UserAndRoleVo roleTwoVo = new UserAndRoleVo();
roleVo.setRole("a");
roleList.add(roleVo);
roleTwoVo.setRole("b");
roleList.add(roleTwoVo);
// userVO.setAuthorities(roleList);
StringBuilder sbf = new StringBuilder();
for (UserAndRoleVo role:roleList
) {
sbf=sbf.append(role.getRole()+",");
}
//处理字符串
String sRole = sbf.toString();
String substring = sRole.substring(0, sRole.lastIndexOf(","));
String token = JwtUtils.createToken(userVO.getUserName(),substring);
// userVO.setToken(token);
result.setData(userVO);
return result;
}
/**
* app用户注册接口
* @param registerDto
* @return
*/
@Override
public ApiResponse register(RegisterDto registerDto) {
//通过手机号查询用户信息
UserVO userVO = appUserMapper.selectByPhone(registerDto.getPhone());
if (null != userVO){
throw new BusinessException("该用户已经注册");
}
//用户实体类
AppUser appUser = new AppUser();
appUser.setId(SnowFlakeUtil.nextId());
appUser.setFaceidFalg(UserEnum.NOTFACE.getCode());
appUser.setFigerprintFalg(UserEnum.NOTFINGERPRINT.getCode());
appUser.setHeadPicture(registerDto.getHeadPicture());
appUser.setIsEnable(UserEnum.ENABLE.getCode());
appUser.setPhone(registerDto.getPhone());
//判断注册密码和再次输入密码
if (!registerDto.getLoginPwd().equals(registerDto.getConfirmPwd())){
throw new BusinessException("两次密码输入不相同，请再次输入");
}
appUser.setLoginPwd(registerDto.getLoginPwd());
appUser.setCreateTime(new Date());
appUser.setUpdateTime(new Date());
log.info("用户注册参数==============>"+registerDto);
//将验证码放入到缓存当中(过期时间60s)test
// GuavaUtil.putTrackGuava(registerDto.getPhone(),registerDto.getCode());
//重缓存中获取(通过手机号获取)
String code = (String) GuavaUtil.getTrackGuava(registerDto.getPhone());
log.info("冲缓存中获取的验证码===============》{}",code);
if (null == code){
throw new BusinessException("验证码已过期");
}
if (!code.equals(registerDto.getCode())){
throw new BusinessException("验证码错误请重新输入");
}
int i = appUserMapper.insertSelective(appUser);
if (i<0){
return new ApiResponse().fail("新增失败");
}
return new ApiResponse();
}
/**
* 用户登陆接口
* @param loginDto
* @return
*/
@Override
public ApiResponse<UserVO> userLogin(LoginDto loginDto) {
UserVO userVo = new UserVO();
//首先判断登陆方式
if (loginDto.getType().equals("0")){
//密码登陆
userVo = appUserMapper.selectByPassword(loginDto);
if (null == userVo){
throw new BusinessException("请先注册");
}
}else{
//验证码登陆
String code = (String) GuavaUtil.getTrackGuava(loginDto.getPhone());
log.info("冲缓存中获取的验证码===============》{}",code);
if (null == code){
throw new BusinessException("验证码已过期");
}
if (!code.equals(loginDto.getCode())){
throw new BusinessException("验证码错误请重新输入");
}
userVo = appUserMapper.selectByPhone(loginDto.getPhone());
if (null == userVo){
throw new BusinessException("请先注册");
}
}
//通过用户id查找相关角色信息
//生成token
// String token = JwtUtils.createToken(loginDto.getPhone(),substring);
// userVo.setToken(token);
ApiResponse apiResponse =new ApiResponse();
apiResponse.setData(userVo);
return apiResponse;
}
}
nafmii-app/src/main/java/org/nafmii/user/vo/UserAndRoleVo.java deleted 100644 → 0
package org.nafmii.user.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author:zhoujh
* @Function:TODO
* @date 2021/4/25 9:06
* @ClassName:
* @version:
* @remark:
*/
@Data
public class UserAndRoleVo {
private Long id;
private String userName;
private String password;
@ApiModelProperty("角色名称")
private String Role;
}
nafmii-app/src/main/resources/mapper/AppUserMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<<<<<<< Updated upstream <mapper namespace="org.nafmii.app.user.dao.AppUserMapper">
<mapper namespace="org.nafmii.user.mapper.user.AppUserMapper">
<resultMap id="BaseResultMap" type="org.nafmii.user.po.user.AppUser"> <!-- 通用查询映射结果 -->
======= <resultMap id="BaseResultMap" type="org.nafmii.app.user.entity.AppUserPO">
<mapper namespace="org.nafmii.app.mapper.user.AppUserMapper"> <id column="ID" property="id" />
<resultMap id="BaseResultMap" type="org.nafmii.app.entity.user.AppUser"> <result column="USER_NAME" property="userName" />
>>>>>>> Stashed changes <result column="LOGIN_PWD" property="loginPwd" />
<id column="ID" jdbcType="BIGINT" property="id" /> <result column="REAL_NAME" property="realName" />
<result column="USER_NAME" jdbcType="VARCHAR" property="userName" /> <result column="PHONE" property="phone" />
<result column="LOGIN_PWD" jdbcType="VARCHAR" property="loginPwd" /> <result column="BIRTHDAY" property="birthday" />
<result column="REAL_NAME" jdbcType="VARCHAR" property="realName" /> <result column="EMAIL" property="email" />
<result column="PHONE" jdbcType="VARCHAR" property="phone" /> <result column="HEAD_PICTURE" property="headPicture" />
<result column="BIRTHDAY" jdbcType="VARCHAR" property="birthday" /> <result column="NATIONALITY" property="nationality" />
<result column="EMAIL" jdbcType="VARCHAR" property="email" /> <result column="UNIT_NAME" property="unitName" />
<result column="HEAD_PICTURE" jdbcType="VARCHAR" property="headPicture" /> <result column="OPEN_ID" property="openId" />
<result column="NATIONALITY" jdbcType="VARCHAR" property="nationality" /> <result column="FIGERPRINT_FALG" property="figerprintFalg" />
<result column="UNIT_NAME" jdbcType="VARCHAR" property="unitName" /> <result column="FACEID_FALG" property="faceidFalg" />
<result column="OPEN_ID" jdbcType="VARCHAR" property="openId" /> <result column="CREATE_TIME" property="createTime" />
<result column="FIGERPRINT_FALG" jdbcType="VARCHAR" property="figerprintFalg" /> <result column="UPDATE_TIME" property="updateTime" />
<result column="FACEID_FALG" jdbcType="VARCHAR" property="faceidFalg" /> <result column="IS_ENABLE" property="isEnable" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" /> </resultMap>
<result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
<result column="IS_ENABLE" jdbcType="VARCHAR" property="isEnable" /> <!-- 通用查询结果列 -->
</resultMap> <sql id="Base_Column_List">
<sql id="Example_Where_Clause"> ID, USER_NAME, LOGIN_PWD, REAL_NAME, PHONE, BIRTHDAY, EMAIL, HEAD_PICTURE, NATIONALITY, UNIT_NAME, OPEN_ID, FIGERPRINT_FALG, FACEID_FALG, CREATE_TIME, UPDATE_TIME, IS_ENABLE
<where> </sql>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid"> <select id="selectByPassword" parameterType="org.nafmii.app.user.dto.LoginDto" resultType="org.nafmii.app.user.vo.UserVO">
<trim prefix="(" prefixOverrides="and" suffix=")"> select ID as id,
<foreach collection="criteria.criteria" item="criterion"> USER_NAME as userName, LOGIN_PWD as loginPwd, REAL_NAME as realName, PHONE as phone, BIRTHDAY as birthday, EMAIL as email, HEAD_PICTURE as headPicture, NATIONALITY as nationality,
<choose> UNIT_NAME as unitName, OPEN_ID as openId, FIGERPRINT_FALG as figerprintFalg, FACEID_FALG as faceidFalg, CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
<when test="criterion.noValue"> from APP_USER where IS_ENABLE = 0
and ${criterion.condition} <if test="phone !=null">
</when> and PHONE !=#{phone}
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if> </if>
</foreach> <if test="loginPwd !=null">
</where> and LOGIN_PWD !=#{loginPwd}
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if> </if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
ID, USER_NAME, LOGIN_PWD, REAL_NAME, PHONE, BIRTHDAY, EMAIL, HEAD_PICTURE, NATIONALITY,
UNIT_NAME, OPEN_ID, FIGERPRINT_FALG, FACEID_FALG, CREATE_TIME, UPDATE_TIME, IS_ENABLE
</sql>
<<<<<<< Updated upstream
<select id="selectByPassword" parameterType="org.nafmii.user.dto.user.LoginDto" resultType="org.nafmii.user.vo.UserVO">
=======
<select id="selectByPassword" parameterType="org.nafmii.app.dto.user.LoginDto" resultType="org.nafmii.app.vo.UserVO">
>>>>>>> Stashed changes
select ID as id,
USER_NAME as userName, LOGIN_PWD as loginPwd, REAL_NAME as realName, PHONE as phone, BIRTHDAY as birthday, EMAIL as email, HEAD_PICTURE as headPicture, NATIONALITY as nationality,
UNIT_NAME as unitName, OPEN_ID as openId, FIGERPRINT_FALG as figerprintFalg, FACEID_FALG as faceidFalg, CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from APP_USER where IS_ENABLE = 0
<if test="phone !=null">
and PHONE !=#{phone}
</if>
<if test="loginPwd !=null">
and LOGIN_PWD !=#{loginPwd}
</if>
</select>
<<<<<<< Updated upstream
<select id="selectByPhone" parameterType="map" resultType="org.nafmii.user.vo.UserVO">
=======
<select id="selectByPhone" parameterType="map" resultType="org.nafmii.app.vo.UserVO">
>>>>>>> Stashed changes
select ID as id,
USER_NAME as userName, LOGIN_PWD as loginPwd, REAL_NAME as realName, PHONE as phone, BIRTHDAY as birthday, EMAIL as email, HEAD_PICTURE as headPicture, NATIONALITY as nationality,
UNIT_NAME as unitName, OPEN_ID as openId, FIGERPRINT_FALG as figerprintFalg, FACEID_FALG as faceidFalg, CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from APP_USER where IS_ENABLE = 0
<if test="phone !=null">
and PHONE !=#{phone}
</if>
</select>
<<<<<<< Updated upstream
<select id="selectByExample" parameterType="org.nafmii.user.po.user.AppUserExample" resultMap="BaseResultMap">
=======
<select id="selectByExample" parameterType="org.nafmii.app.entity.user.AppUserExample" resultMap="BaseResultMap">
>>>>>>> Stashed changes
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from APP_USER
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from APP_USER
where ID = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from APP_USER
where ID = #{id,jdbcType=BIGINT}
</delete>
<<<<<<< Updated upstream
<delete id="deleteByExample" parameterType="org.nafmii.user.po.user.AppUserExample">
=======
<delete id="deleteByExample" parameterType="org.nafmii.app.entity.user.AppUserExample">
>>>>>>> Stashed changes
delete from APP_USER
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<<<<<<< Updated upstream
<insert id="insert" parameterType="org.nafmii.user.po.user.AppUser">
=======
<insert id="insert" parameterType="org.nafmii.app.entity.user.AppUser">
>>>>>>> Stashed changes
insert into APP_USER (ID, USER_NAME, LOGIN_PWD,
REAL_NAME, PHONE, BIRTHDAY,
EMAIL, HEAD_PICTURE, NATIONALITY,
UNIT_NAME, OPEN_ID, FIGERPRINT_FALG,
FACEID_FALG, CREATE_TIME, UPDATE_TIME,
IS_ENABLE)
values (#{id,jdbcType=BIGINT}, #{userName,jdbcType=VARCHAR}, #{loginPwd,jdbcType=VARCHAR},
#{realName,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{birthday,jdbcType=VARCHAR},
#{email,jdbcType=VARCHAR}, #{headPicture,jdbcType=VARCHAR}, #{nationality,jdbcType=VARCHAR},
#{unitName,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{figerprintFalg,jdbcType=VARCHAR},
#{faceidFalg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
#{isEnable,jdbcType=VARCHAR})
</insert>
<<<<<<< Updated upstream
<insert id="insertSelective" parameterType="org.nafmii.user.po.user.AppUserExample">
=======
<insert id="insertSelective" parameterType="org.nafmii.app.entity.user.AppUserExample">
>>>>>>> Stashed changes
insert into APP_USER
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
ID,
</if>
<if test="userName != null">
USER_NAME,
</if>
<if test="loginPwd != null">
LOGIN_PWD,
</if>
<if test="realName != null">
REAL_NAME,
</if>
<if test="phone != null">
PHONE,
</if>
<if test="birthday != null">
BIRTHDAY,
</if>
<if test="email != null">
EMAIL,
</if>
<if test="headPicture != null">
HEAD_PICTURE,
</if>
<if test="nationality != null">
NATIONALITY,
</if>
<if test="unitName != null">
UNIT_NAME,
</if>
<if test="openId != null">
OPEN_ID,
</if>
<if test="figerprintFalg != null">
FIGERPRINT_FALG,
</if>
<if test="faceidFalg != null">
FACEID_FALG,
</if>
<if test="createTime != null">
CREATE_TIME,
</if>
<if test="updateTime != null">
UPDATE_TIME,
</if>
<if test="isEnable != null">
IS_ENABLE,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="userName != null">
#{userName,jdbcType=VARCHAR},
</if>
<if test="loginPwd != null">
#{loginPwd,jdbcType=VARCHAR},
</if>
<if test="realName != null">
#{realName,jdbcType=VARCHAR},
</if>
<if test="phone != null">
#{phone,jdbcType=VARCHAR},
</if>
<if test="birthday != null">
#{birthday,jdbcType=VARCHAR},
</if>
<if test="email != null">
#{email,jdbcType=VARCHAR},
</if>
<if test="headPicture != null">
#{headPicture,jdbcType=VARCHAR},
</if>
<if test="nationality != null">
#{nationality,jdbcType=VARCHAR},
</if>
<if test="unitName != null">
#{unitName,jdbcType=VARCHAR},
</if>
<if test="openId != null">
#{openId,jdbcType=VARCHAR},
</if>
<if test="figerprintFalg != null">
#{figerprintFalg,jdbcType=VARCHAR},
</if>
<if test="faceidFalg != null">
#{faceidFalg,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="isEnable != null">
#{isEnable,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<<<<<<< Updated upstream
<select id="countByExample" parameterType="org.nafmii.user.po.user.AppUserExample" resultType="java.lang.Long">
=======
<select id="countByExample" parameterType="org.nafmii.app.entity.user.AppUserExample" resultType="java.lang.Long">
>>>>>>> Stashed changes
select count(*) from APP_USER
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update APP_USER
<set>
<if test="record.id != null">
ID = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.userName != null">
USER_NAME = #{record.userName,jdbcType=VARCHAR},
</if>
<if test="record.loginPwd != null">
LOGIN_PWD = #{record.loginPwd,jdbcType=VARCHAR},
</if>
<if test="record.realName != null">
REAL_NAME = #{record.realName,jdbcType=VARCHAR},
</if>
<if test="record.phone != null">
PHONE = #{record.phone,jdbcType=VARCHAR},
</if>
<if test="record.birthday != null">
BIRTHDAY = #{record.birthday,jdbcType=VARCHAR},
</if>
<if test="record.email != null">
EMAIL = #{record.email,jdbcType=VARCHAR},
</if>
<if test="record.headPicture != null">
HEAD_PICTURE = #{record.headPicture,jdbcType=VARCHAR},
</if>
<if test="record.nationality != null">
NATIONALITY = #{record.nationality,jdbcType=VARCHAR},
</if>
<if test="record.unitName != null">
UNIT_NAME = #{record.unitName,jdbcType=VARCHAR},
</if>
<if test="record.openId != null">
OPEN_ID = #{record.openId,jdbcType=VARCHAR},
</if>
<if test="record.figerprintFalg != null">
FIGERPRINT_FALG = #{record.figerprintFalg,jdbcType=VARCHAR},
</if>
<if test="record.faceidFalg != null">
FACEID_FALG = #{record.faceidFalg,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.isEnable != null">
IS_ENABLE = #{record.isEnable,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update APP_USER
set ID = #{record.id,jdbcType=BIGINT},
USER_NAME = #{record.userName,jdbcType=VARCHAR},
LOGIN_PWD = #{record.loginPwd,jdbcType=VARCHAR},
REAL_NAME = #{record.realName,jdbcType=VARCHAR},
PHONE = #{record.phone,jdbcType=VARCHAR},
BIRTHDAY = #{record.birthday,jdbcType=VARCHAR},
EMAIL = #{record.email,jdbcType=VARCHAR},
HEAD_PICTURE = #{record.headPicture,jdbcType=VARCHAR},
NATIONALITY = #{record.nationality,jdbcType=VARCHAR},
UNIT_NAME = #{record.unitName,jdbcType=VARCHAR},
OPEN_ID = #{record.openId,jdbcType=VARCHAR},
FIGERPRINT_FALG = #{record.figerprintFalg,jdbcType=VARCHAR},
FACEID_FALG = #{record.faceidFalg,jdbcType=VARCHAR},
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
IS_ENABLE = #{record.isEnable,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<<<<<<< Updated upstream
<update id="updateByPrimaryKeySelective" parameterType="org.nafmii.user.po.user.AppUserExample">
=======
<update id="updateByPrimaryKeySelective" parameterType="org.nafmii.app.entity.user.AppUserExample">
>>>>>>> Stashed changes
update APP_USER
<set>
<if test="userName != null">
USER_NAME = #{userName,jdbcType=VARCHAR},
</if>
<if test="loginPwd != null">
LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},
</if>
<if test="realName != null">
REAL_NAME = #{realName,jdbcType=VARCHAR},
</if>
<if test="phone != null">
PHONE = #{phone,jdbcType=VARCHAR},
</if>
<if test="birthday != null">
BIRTHDAY = #{birthday,jdbcType=VARCHAR},
</if>
<if test="email != null">
EMAIL = #{email,jdbcType=VARCHAR},
</if>
<if test="headPicture != null">
HEAD_PICTURE = #{headPicture,jdbcType=VARCHAR},
</if>
<if test="nationality != null">
NATIONALITY = #{nationality,jdbcType=VARCHAR},
</if>
<if test="unitName != null">
UNIT_NAME = #{unitName,jdbcType=VARCHAR},
</if>
<if test="openId != null">
OPEN_ID = #{openId,jdbcType=VARCHAR},
</if>
<if test="figerprintFalg != null">
FIGERPRINT_FALG = #{figerprintFalg,jdbcType=VARCHAR},
</if>
<if test="faceidFalg != null">
FACEID_FALG = #{faceidFalg,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="isEnable != null">
IS_ENABLE = #{isEnable,jdbcType=VARCHAR},
</if>
</set>
where ID = #{id,jdbcType=BIGINT}
</update>
<<<<<<< Updated upstream
<update id="updateByPrimaryKey" parameterType="org.nafmii.user.po.user.AppUser">
=======
<update id="updateByPrimaryKey" parameterType="org.nafmii.app.entity.user.AppUser">
>>>>>>> Stashed changes
update APP_USER
set USER_NAME = #{userName,jdbcType=VARCHAR},
LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},
REAL_NAME = #{realName,jdbcType=VARCHAR},
PHONE = #{phone,jdbcType=VARCHAR},
BIRTHDAY = #{birthday,jdbcType=VARCHAR},
EMAIL = #{email,jdbcType=VARCHAR},
HEAD_PICTURE = #{headPicture,jdbcType=VARCHAR},
NATIONALITY = #{nationality,jdbcType=VARCHAR},
UNIT_NAME = #{unitName,jdbcType=VARCHAR},
OPEN_ID = #{openId,jdbcType=VARCHAR},
FIGERPRINT_FALG = #{figerprintFalg,jdbcType=VARCHAR},
FACEID_FALG = #{faceidFalg,jdbcType=VARCHAR},
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
IS_ENABLE = #{isEnable,jdbcType=VARCHAR}
where ID = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file \ No newline at end of file
</select>
<select id="selectByPhone" parameterType="map" resultType="org.nafmii.app.user.vo.UserVO">
select ID as id,
USER_NAME as userName, LOGIN_PWD as loginPwd, REAL_NAME as realName, PHONE as phone, BIRTHDAY as birthday, EMAIL as email, HEAD_PICTURE as headPicture, NATIONALITY as nationality,
UNIT_NAME as unitName, OPEN_ID as openId, FIGERPRINT_FALG as figerprintFalg, FACEID_FALG as faceidFalg, CREATE_TIME as createTime, UPDATE_TIME as updateTime, IS_ENABLE as isEnable
from APP_USER where IS_ENABLE = 0
<if test="phone !=null">
and PHONE !=#{phone}
</if>
</select>
</mapper>
nafmii-common/pom.xml
...@@ -25,6 +25,11 @@ ...@@ -25,6 +25,11 @@
<artifactId>spring-cloud-starter-openfeign</artifactId> <artifactId>spring-cloud-starter-openfeign</artifactId>
<version>3.0.2</version> <version>3.0.2</version>
</dependency> </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.20</version>
</dependency>
<!--swagger 相关依赖--> <!--swagger 相关依赖-->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
......
nafmii-common/src/main/java/org/nafmii/common/utils/GeneratorCodeConfig.java
...@@ -66,7 +66,7 @@ public class GeneratorCodeConfig { ...@@ -66,7 +66,7 @@ public class GeneratorCodeConfig {
GlobalConfig gc = new GlobalConfig(); GlobalConfig gc = new GlobalConfig();
String projectPath = System.getProperty("user.dir")+"/"+moduleName; String projectPath = System.getProperty("user.dir")+"/"+moduleName;
gc.setOutputDir(projectPath + "/src/main/java"); gc.setOutputDir(projectPath + "/src/main/java");
gc.setAuthor("lvyp"); gc.setAuthor("zjh");
gc.setOpen(false); gc.setOpen(false);
gc.setBaseResultMap(true); gc.setBaseResultMap(true);
gc.setBaseColumnList(true); gc.setBaseColumnList(true);
......
nafmii-common/src/main/java/org/nafmii/common/utils/JwtUtils.java
package org.nafmii.utils; package org.nafmii.common.utils;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!