Skip to content

D
datav_platform
Commit b516bd52 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	datav-manager/pom.xml
parents c2085785 ee40adaa
Show whitespace changes
Inline Side-by-side
Showing with 7059 additions and 1077 deletions
common-lib/pom.xml
View file @ b516bd52
...@@ -53,16 +53,7 @@ ...@@ -53,16 +53,7 @@
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>4.8.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
......
common-lib/src/main/java/com/mortals/xhx/system/MessageProducer.java deleted 100644 → 0
View file @ c2085785
package com.mortals.xhx.system;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.model.AccessLogPdu;
import com.mortals.framework.model.BizLogPdu;
import com.mortals.framework.model.ErrorLogPdu;
import com.mortals.framework.model.OperateLogPdu;
import com.mortals.framework.service.IMessageProduceService;
import com.mortals.xhx.common.keys.QueueKey;
import lombok.extern.slf4j.Slf4j;
import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Component;
@Component
@Primary
@Slf4j
public class MessageProducer implements IMessageProduceService {
@Autowired
private RabbitTemplate rabbitTemplate;
public void syncAccessSend(AccessLogPdu accessLogPdu) {
//new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8))
//rabbitTemplate.send(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE,new Message(JSON.toJSONString(accessLogPdu).getBytes(StandardCharsets.UTF_8)));
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, JSON.toJSONString(accessLogPdu));
//rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ACCESS_LOG_QUEUE, accessLogPdu);
}
@Override
public void syncBizSend(BizLogPdu bizLogPdu) {
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.BIZ_LOG_QUEUE, JSON.toJSONString(bizLogPdu));
}
@Override
public void syncErrorSend(ErrorLogPdu errorLogPdu) {
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.ERROR_LOG_QUEUE, JSON.toJSONString(errorLogPdu));
}
@Override
public void syncOperSend(OperateLogPdu operLogPdu) {
log.info(JSON.toJSONString(operLogPdu));
rabbitTemplate.convertAndSend(QueueKey.EXCHANGE, QueueKey.OPERATION_LOG_QUEUE, JSON.toJSONString(operLogPdu));
}
}
datav-manager/pom.xml
View file @ b516bd52
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.98:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://192.168.0.98:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password> <profiles.datasource.password>xhx@2022</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri> <profiles.redis.uri>192.168.0.252</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
...@@ -50,12 +50,7 @@ ...@@ -50,12 +50,7 @@
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.98:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://192.168.0.98:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password> <profiles.datasource.password>xhx@2022</profiles.datasource.password>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri> <profiles.redis.uri>192.168.0.252</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
...@@ -73,10 +68,10 @@ ...@@ -73,10 +68,10 @@
<profiles.active>product</profiles.active> <profiles.active>product</profiles.active>
<profiles.server.port>17002</profiles.server.port> <profiles.server.port>17002</profiles.server.port>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.98:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://127.0.0.1:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password> <profiles.datasource.password>nacos@2020</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri> <profiles.redis.uri>127.0.0.1</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
<profiles.redis.password>hotel@2020</profiles.redis.password> <profiles.redis.password>hotel@2020</profiles.redis.password>
...@@ -94,14 +89,9 @@ ...@@ -94,14 +89,9 @@
<profiles.active>yibin</profiles.active> <profiles.active>yibin</profiles.active>
<profiles.server.port>17003</profiles.server.port> <profiles.server.port>17003</profiles.server.port>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://172.15.28.122:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://172.15.28.121:3306/datav_platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>xhx@2022</profiles.datasource.password> <profiles.datasource.password>xhx@2022</profiles.datasource.password>
<profiles.rabbitmq.host>172.15.28.117</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.redis.uri>172.15.28.120</profiles.redis.uri> <profiles.redis.uri>172.15.28.120</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
......
datav-manager/src/main/java/com/mortals/xhx/base/framework/aspect/OperlogAspect.java
View file @ b516bd52
...@@ -4,9 +4,6 @@ import java.util.Date; ...@@ -4,9 +4,6 @@ import java.util.Date;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import com.mortals.framework.model.OperateLogPdu;
import com.mortals.framework.service.IMessageProduceService;
import com.mortals.xhx.system.MessageProducer;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterReturning;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
...@@ -16,7 +13,6 @@ import org.slf4j.Logger; ...@@ -16,7 +13,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
...@@ -34,27 +30,12 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService { ...@@ -34,27 +30,12 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService {
@Autowired @Autowired
private OperLogService operLogService; private OperLogService operLogService;
@Autowired
private IMessageProduceService messageProducer;
@Override @Override
public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl, public void doHandlerLog(String platformMark, Long userId, String userName, String loginName, String requestUrl,
String content, String ip, Date logDate) { String content, String ip, Date logDate) {
super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate); super.doHandlerLog(platformMark, userId, userName, loginName, requestUrl, content, ip, logDate);
operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content); operLogService.insertOperLog(ip, requestUrl, userId, userName, loginName, content);
OperateLogPdu operateLogPdu = new OperateLogPdu();
operateLogPdu.initAttrValue();
operateLogPdu.setIp(ip);
operateLogPdu.setRequestUrl(requestUrl);
operateLogPdu.setUserId(userId);
operateLogPdu.setUserName(userName);
operateLogPdu.setLoginName(loginName);
operateLogPdu.setPlatformMark(platformMark);
operateLogPdu.setLogDate(logDate);
operateLogPdu.setContent(content);
operateLogPdu.setOperType(1);
messageProducer.syncOperSend(operateLogPdu);
} }
@Override @Override
...@@ -62,8 +43,6 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService { ...@@ -62,8 +43,6 @@ public class OperlogAspect extends FileLogServiceImpl implements ILogService {
// operLogService.insertOperLog(ip, requestUrl, null, "", loginName, // operLogService.insertOperLog(ip, requestUrl, null, "", loginName,
// content); // content);
this.doHandlerLog(platformMark, null, "", loginName, requestUrl, content, ip, new Date()); this.doHandlerLog(platformMark, null, "", loginName, requestUrl, content, ip, new Date());
} }
@Pointcut("execution(public * com.mortals.xhx..*Controller.*(..))") @Pointcut("execution(public * com.mortals.xhx..*Controller.*(..))")
......
datav-manager/src/main/java/com/mortals/xhx/base/framework/aspect/WebLogAspect.java
View file @ b516bd52
...@@ -27,8 +27,8 @@ import java.util.Map; ...@@ -27,8 +27,8 @@ import java.util.Map;
* @author: zxfei * @author: zxfei
* @date: 2022/4/20 9:24 * @date: 2022/4/20 9:24
*/ */
//@Aspect @Aspect
//@Component @Component
@Slf4j @Slf4j
@Order(1) @Order(1)
@Profile({"default", "develop", "test"}) @Profile({"default", "develop", "test"})
......
datav-manager/src/main/java/com/mortals/xhx/base/framework/security/AuthTokenServiceImpl.java
View file @ b516bd52
...@@ -124,6 +124,11 @@ public class AuthTokenServiceImpl implements IAuthTokenService { ...@@ -124,6 +124,11 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
return siteIds; return siteIds;
} }
@Override
public String getAreaCodes() {
return null;
}
@Override @Override
public Long getCustomerJoinId() { public Long getCustomerJoinId() {
return null; return null;
......
datav-manager/src/main/java/com/mortals/xhx/base/framework/security/SecurityUtils.java
View file @ b516bd52
//package com.mortals.xhx.base.framework.security; package com.mortals.xhx.base.framework.security;
//
//import org.springframework.security.core.Authentication;
//import org.springframework.security.core.context.SecurityContextHolder; import org.apache.tomcat.util.net.openssl.ciphers.Authentication;
//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
//
///** /**
// * 安全服务工具类 * 安全服务工具类
// * *
// * @author zxfei * @author zxfei
// */ */
//public class SecurityUtils { public class SecurityUtils {
//
//
// /** /**
// * 获取Authentication * 获取Authentication
// */ */
// public static Authentication getAuthentication() { public static Authentication getAuthentication() {
// return SecurityContextHolder.getContext().getAuthentication(); return null;
// } }
//
// /** /**
// * 生成BCryptPasswordEncoder密码 * 生成BCryptPasswordEncoder密码
// * *
// * @param password 密码 * @param password 密码
// * @return 加密字符串 * @return 加密字符串
// */ */
// public static String encryptPassword(String password) { public static String encryptPassword(String password) {
// BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
// return passwordEncoder.encode(password); return passwordEncoder.encode(password);
// } }
//
// /** /**
// * 判断密码是否相同 * 判断密码是否相同
// * *
// * @param rawPassword 真实密码 * @param rawPassword 真实密码
// * @param encodedPassword 加密后字符 * @param encodedPassword 加密后字符
// * @return 结果 * @return 结果
// */ */
// public static boolean matchesPassword(String rawPassword, String encodedPassword) { public static boolean matchesPassword(String rawPassword, String encodedPassword) {
// BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
// return passwordEncoder.matches(rawPassword, encodedPassword); return passwordEncoder.matches(rawPassword, encodedPassword);
// } }
//
// /** /**
// * 是否为管理员 * 是否为管理员
// * *
// * @param userId 用户ID * @param userId 用户ID
// * @return 结果 * @return 结果
// */ */
// public static boolean isAdmin(Long userId) { public static boolean isAdmin(Long userId) {
// return userId != null && 1L == userId; return userId != null && 1L == userId;
// } }
//} }
datav-manager/src/main/java/com/mortals/xhx/base/login/web/CustomerLoginController.java
View file @ b516bd52
...@@ -2,10 +2,13 @@ package com.mortals.xhx.base.login.web; ...@@ -2,10 +2,13 @@ package com.mortals.xhx.base.login.web;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.IAuthTokenService; import com.mortals.framework.service.IAuthTokenService;
import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.valid.service.ValidCodeService;
import com.mortals.xhx.common.utils.LoginAESUtil;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.service.CustomerService; import com.mortals.xhx.module.customer.service.CustomerService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -24,6 +27,11 @@ public class CustomerLoginController extends BaseCRUDJsonBodyMappingController<C ...@@ -24,6 +27,11 @@ public class CustomerLoginController extends BaseCRUDJsonBodyMappingController<C
private CustomerService customerService; private CustomerService customerService;
@Autowired @Autowired
private IAuthTokenService authTokenService; private IAuthTokenService authTokenService;
@Autowired
private ValidCodeService validCodeService;
private static final String AES_KEY = "0000000671595991";
private static final String AES_IV = "tdrdadq59tbss5n7";
@RequestMapping("login") @RequestMapping("login")
public String login(@RequestBody LoginForm loginForm) throws Exception { public String login(@RequestBody LoginForm loginForm) throws Exception {
...@@ -37,9 +45,17 @@ public class CustomerLoginController extends BaseCRUDJsonBodyMappingController<C ...@@ -37,9 +45,17 @@ public class CustomerLoginController extends BaseCRUDJsonBodyMappingController<C
ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录"); ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录");
return ret.toJSONString(); return ret.toJSONString();
} }
if(loginForm.getType()!=null && loginForm.getType()==2){
loginName = LoginAESUtil.decrypt(loginName,AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
password = LoginAESUtil.decrypt(password,AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
}
CustomerEntity customerEntity = null; CustomerEntity customerEntity = null;
try { try {
loginForm.validate(); loginForm.validate();
boolean validCode = validCodeService.doCheckImageValidCode(loginForm.getMark(),super.getRequestIP(request),loginForm.getSecurityCode());
if(!validCode){
throw new AppException("验证码错误");
}
customerEntity = customerService.doLogin(loginName, password, ip); customerEntity = customerService.doLogin(loginName, password, ip);
customerEntity.setLastLoginAddress(ip); customerEntity.setLastLoginAddress(ip);
customerEntity.setLoginTime(System.currentTimeMillis()); customerEntity.setLoginTime(System.currentTimeMillis());
...@@ -62,12 +78,8 @@ public class CustomerLoginController extends BaseCRUDJsonBodyMappingController<C ...@@ -62,12 +78,8 @@ public class CustomerLoginController extends BaseCRUDJsonBodyMappingController<C
} }
@RequestMapping("logout") @RequestMapping("logout")
public String logout() throws Exception { public void logout() throws Exception {
recordSysLog(request, "退出登录"); recordSysLog(request, "退出登录");
super.removeCurrUser(request); super.removeCurrUser(request);
JSONObject ret = new JSONObject();
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户退出系统成功!");
return ret.toJSONString();
} }
} }
datav-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @ b516bd52
...@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.ap.SysConstains; import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ICacheService; import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.ITokenService; import com.mortals.framework.service.ITokenService;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
...@@ -19,6 +20,7 @@ import com.mortals.xhx.base.system.user.model.UserEntity; ...@@ -19,6 +20,7 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.base.system.valid.service.ValidCodeService; import com.mortals.xhx.base.system.valid.service.ValidCodeService;
import com.mortals.xhx.common.key.RedisKey; import com.mortals.xhx.common.key.RedisKey;
import com.mortals.xhx.common.utils.LoginAESUtil;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -48,6 +50,9 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -48,6 +50,9 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
@Autowired @Autowired
private ICacheService cacheService; private ICacheService cacheService;
private static final String AES_KEY = "0000000671595991";
private static final String AES_IV = "tdrdadq59tbss5n7";
private static Log logger = LogFactory.getLog(LoginController.class); private static Log logger = LogFactory.getLog(LoginController.class);
@RequestMapping("login") @RequestMapping("login")
...@@ -63,10 +68,17 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -63,10 +68,17 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录"); ret.put(KEY_RESULT_MSG, "未获取到用户信息，请重新登录");
return ret.toJSONString(); return ret.toJSONString();
} }
if(loginForm.getType()!=null && loginForm.getType()==2){
loginName = LoginAESUtil.decrypt(loginName,AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
password = LoginAESUtil.decrypt(password,AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
}
UserEntity userEntity = null; UserEntity userEntity = null;
try { try {
loginForm.validate(); loginForm.validate();
boolean validCode = validCodeService.doCheckImageValidCode(loginForm.getMark(),super.getRequestIP(request),loginForm.getSecurityCode());
if(!validCode){
throw new AppException("验证码错误");
}
userEntity = userService.doLogin(loginName, password, ip); userEntity = userService.doLogin(loginName, password, ip);
userEntity.setLastLoginAddress(ip); userEntity.setLastLoginAddress(ip);
//saveCurrUser(request, response, userEntity); //saveCurrUser(request, response, userEntity);
...@@ -109,13 +121,9 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi ...@@ -109,13 +121,9 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
} }
@RequestMapping("logout") @RequestMapping("logout")
public String logout() throws Exception { public void logout() throws Exception {
recordSysLog(request, "退出登录"); recordSysLog(request, "退出登录");
super.removeCurrUser(request); super.removeCurrUser(request);
JSONObject ret = new JSONObject();
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户退出系统成功!");
return ret.toJSONString();
} }
@RequestMapping("index") @RequestMapping("index")
......
datav-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java
View file @ b516bd52
...@@ -10,6 +10,10 @@ public class LoginForm extends BaseForm { ...@@ -10,6 +10,10 @@ public class LoginForm extends BaseForm {
private String securityCode; private String securityCode;
private String mark;
/** 加密方式 1不加密，2加密*/
private Integer type;
public String getLoginName() { public String getLoginName() {
return loginName; return loginName;
} }
...@@ -35,6 +39,22 @@ public class LoginForm extends BaseForm { ...@@ -35,6 +39,22 @@ public class LoginForm extends BaseForm {
this.securityCode = securityCode; this.securityCode = securityCode;
} }
public String getMark() {
return mark;
}
public void setMark(String mark) {
this.mark = mark;
}
public Integer getType() {
return type;
}
public void setType(Integer type) {
this.type = type;
}
@Override @Override
public String toString() { public String toString() {
return "loginName:" + this.loginName + " password:" + this.password; return "loginName:" + this.loginName + " password:" + this.password;
...@@ -48,9 +68,9 @@ public class LoginForm extends BaseForm { ...@@ -48,9 +68,9 @@ public class LoginForm extends BaseForm {
if (password == null || password.trim().length() == 0) { if (password == null || password.trim().length() == 0) {
throw new AppException("密码不能为空！"); throw new AppException("密码不能为空！");
} }
// if (securityCode == null || securityCode.trim().length() == 0) { if (securityCode == null || securityCode.trim().length() == 0) {
// throw new AppException("验证码不能为空！"); throw new AppException("验证码不能为空！");
// } }
return super.validate(); return super.validate();
} }
} }
datav-manager/src/main/java/com/mortals/xhx/base/login/web/SecurityCodeController.java
View file @ b516bd52
...@@ -28,9 +28,7 @@ public class SecurityCodeController ...@@ -28,9 +28,7 @@ public class SecurityCodeController
public void createCode(HttpServletRequest request, HttpServletResponse response) { public void createCode(HttpServletRequest request, HttpServletResponse response) {
// 获取默认难度和长度的验证码 // 获取默认难度和长度的验证码
String securityCode = validCodeService.createImageValidCode(request.getSession().getId(), String securityCode = validCodeService.createImageValidCode(request.getParameter("mark"),super.getRequestIP(request));
super.getRequestIP(request));
// int imageType = ParamUtil.getInt("securityImage", 1); // int imageType = ParamUtil.getInt("securityImage", 1);
int imageType = 0; int imageType = 0;
switch (imageType) { switch (imageType) {
......
datav-manager/src/main/java/com/mortals/xhx/base/system/user/dao/UserPwdRecordDao.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.base.system.user.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.base.system.user.model.UserPwdRecordEntity;
/**
* 用户密码修改记录Dao
* 用户密码修改记录 DAO接口
*
* @author zxfei
* @date 2023-07-26
*/
public interface UserPwdRecordDao extends ICRUDDao<UserPwdRecordEntity,Long>{
}
datav-manager/src/main/java/com/mortals/xhx/base/system/user/dao/ibatis/UserPwdRecordDaoImpl.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.base.system.user.dao.ibatis;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.base.system.user.dao.UserPwdRecordDao;
import com.mortals.xhx.base.system.user.model.UserPwdRecordEntity;
import org.springframework.stereotype.Repository;
/**
* 用户密码修改记录DaoImpl DAO接口
*
* @author zxfei
* @date 2023-07-26
*/
@Repository("userPwdRecordDao")
public class UserPwdRecordDaoImpl extends BaseCRUDDaoMybatis<UserPwdRecordEntity,Long> implements UserPwdRecordDao {
}
datav-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserEntity.java
View file @ b516bd52
...@@ -126,6 +126,27 @@ public class UserEntity extends UserEntityExt implements IUser { ...@@ -126,6 +126,27 @@ public class UserEntity extends UserEntityExt implements IUser {
*/ */
private String lastModPwdAddr; private String lastModPwdAddr;
/**
* 密码盐值
*/
private String saltKey;
/**
* 最后一次修改密码时间
*/
private Date lastUpdatePwdTime;
/**
* 当日登录失败数
*/
private Integer errorCount;
/**
* 登录锁定状态0未锁定1已锁定
*/
private Integer loginLock;
/**
* 锁定时间
*/
private Date lockTime;
public UserEntity(){ public UserEntity(){
} }
...@@ -333,6 +354,11 @@ public class UserEntity extends UserEntityExt implements IUser { ...@@ -333,6 +354,11 @@ public class UserEntity extends UserEntityExt implements IUser {
return null; return null;
} }
@Override
public String getAreaCodes() {
return null;
}
/** /**
* 设置 站点id * 设置 站点id
* @param siteId * @param siteId
...@@ -491,6 +517,46 @@ public class UserEntity extends UserEntityExt implements IUser { ...@@ -491,6 +517,46 @@ public class UserEntity extends UserEntityExt implements IUser {
this.lastModPwdAddr = lastModPwdAddr; this.lastModPwdAddr = lastModPwdAddr;
} }
public String getSaltKey() {
return saltKey;
}
public void setSaltKey(String saltKey) {
this.saltKey = saltKey;
}
public Date getLastUpdatePwdTime() {
return lastUpdatePwdTime;
}
public void setLastUpdatePwdTime(Date lastUpdatePwdTime) {
this.lastUpdatePwdTime = lastUpdatePwdTime;
}
public Integer getErrorCount() {
return errorCount;
}
public void setErrorCount(Integer errorCount) {
this.errorCount = errorCount;
}
public Integer getLoginLock() {
return loginLock;
}
public void setLoginLock(Integer loginLock) {
this.loginLock = loginLock;
}
public Date getLockTime() {
return lockTime;
}
public void setLockTime(Date lockTime) {
this.lockTime = lockTime;
}
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(super.hashCode(), loginName, loginPwd, loginPwd1, loginPwd2, loginPwd3, loginLimitAddress, realName, mobile, phone, email, qq, userType, status, customerId, createTime, createUserId, createUserName, lastLoginTime, lastLoginAddress, lastModPwdTime, lastModPwdAddr); return Objects.hash(super.hashCode(), loginName, loginPwd, loginPwd1, loginPwd2, loginPwd3, loginLimitAddress, realName, mobile, phone, email, qq, userType, status, customerId, createTime, createUserId, createUserName, lastLoginTime, lastLoginAddress, lastModPwdTime, lastModPwdAddr);
......
datav-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserPwdRecordEntity.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.base.system.user.model;
import com.mortals.xhx.base.system.user.model.vo.UserPwdRecordVo;
import lombok.Data;
/**
* 用户密码修改记录实体对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class UserPwdRecordEntity extends UserPwdRecordVo {
private static final long serialVersionUID = 1L;
/**
* 用户ID，主键，自增长
*/
private Long userId;
/**
* 登录名
*/
private String loginName;
/**
* 登录密码，使用md5双次加密
*/
private String loginPwd;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof UserPwdRecordEntity) {
UserPwdRecordEntity tmp = (UserPwdRecordEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.userId = -1L;
this.loginName = "";
this.loginPwd = "";
}
}
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/base/system/user/model/UserPwdRecordQuery.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.base.system.user.model;
import java.util.List;
/**
* 用户密码修改记录查询对象
*
* @author zxfei
* @date 2023-07-26
*/
public class UserPwdRecordQuery extends UserPwdRecordEntity {
/** 开始 主键，自增长 */
private Long idStart;
/** 结束 主键，自增长 */
private Long idEnd;
/** 增加 主键，自增长 */
private Long idIncrement;
/** 主键，自增长列表 */
private List <Long> idList;
/** 主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 用户ID，主键，自增长 */
private Long userIdStart;
/** 结束 用户ID，主键，自增长 */
private Long userIdEnd;
/** 增加 用户ID，主键，自增长 */
private Long userIdIncrement;
/** 用户ID，主键，自增长列表 */
private List <Long> userIdList;
/** 用户ID，主键，自增长排除列表 */
private List <Long> userIdNotList;
/** 登录名 */
private List<String> loginNameList;
/** 登录名排除列表 */
private List <String> loginNameNotList;
/** 登录密码，使用md5双次加密 */
private List<String> loginPwdList;
/** 登录密码，使用md5双次加密排除列表 */
private List <String> loginPwdNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<UserPwdRecordQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<UserPwdRecordQuery> andConditionList;
public UserPwdRecordQuery(){}
/**
* 获取 开始 主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 用户ID，主键，自增长
* @return userIdStart
*/
public Long getUserIdStart(){
return this.userIdStart;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param userIdStart
*/
public void setUserIdStart(Long userIdStart){
this.userIdStart = userIdStart;
}
/**
* 获取 结束 用户ID，主键，自增长
* @return $userIdEnd
*/
public Long getUserIdEnd(){
return this.userIdEnd;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param userIdEnd
*/
public void setUserIdEnd(Long userIdEnd){
this.userIdEnd = userIdEnd;
}
/**
* 获取 增加 用户ID，主键，自增长
* @return userIdIncrement
*/
public Long getUserIdIncrement(){
return this.userIdIncrement;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param userIdIncrement
*/
public void setUserIdIncrement(Long userIdIncrement){
this.userIdIncrement = userIdIncrement;
}
/**
* 获取 用户ID，主键，自增长
* @return userIdList
*/
public List<Long> getUserIdList(){
return this.userIdList;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdList
*/
public void setUserIdList(List<Long> userIdList){
this.userIdList = userIdList;
}
/**
* 获取 用户ID，主键，自增长
* @return userIdNotList
*/
public List<Long> getUserIdNotList(){
return this.userIdNotList;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdNotList
*/
public void setUserIdNotList(List<Long> userIdNotList){
this.userIdNotList = userIdNotList;
}
/**
* 获取 登录名
* @return loginNameList
*/
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 登录名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 登录名
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 登录名
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/**
* 获取 登录密码，使用md5双次加密
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 登录密码，使用md5双次加密
* @return loginPwdNotList
*/
public List<String> getLoginPwdNotList(){
return this.loginPwdNotList;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdNotList
*/
public void setLoginPwdNotList(List<String> loginPwdNotList){
this.loginPwdNotList = loginPwdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 设置 主键，自增长
* @param id
*/
public UserPwdRecordQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public UserPwdRecordQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public UserPwdRecordQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public UserPwdRecordQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public UserPwdRecordQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public UserPwdRecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userId
*/
public UserPwdRecordQuery userId(Long userId){
setUserId(userId);
return this;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param userIdStart
*/
public UserPwdRecordQuery userIdStart(Long userIdStart){
this.userIdStart = userIdStart;
return this;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param userIdEnd
*/
public UserPwdRecordQuery userIdEnd(Long userIdEnd){
this.userIdEnd = userIdEnd;
return this;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param userIdIncrement
*/
public UserPwdRecordQuery userIdIncrement(Long userIdIncrement){
this.userIdIncrement = userIdIncrement;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdList
*/
public UserPwdRecordQuery userIdList(List<Long> userIdList){
this.userIdList = userIdList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdNotList
*/
public UserPwdRecordQuery userIdNotList(List<Long> userIdNotList){
this.userIdNotList = userIdNotList;
return this;
}
/**
* 设置 登录名
* @param loginName
*/
public UserPwdRecordQuery loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 登录名
* @param loginNameList
*/
public UserPwdRecordQuery loginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
return this;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwd
*/
public UserPwdRecordQuery loginPwd(String loginPwd){
setLoginPwd(loginPwd);
return this;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdList
*/
public UserPwdRecordQuery loginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public UserPwdRecordQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public UserPwdRecordQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public UserPwdRecordQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public UserPwdRecordQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public UserPwdRecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public UserPwdRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<UserPwdRecordQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<UserPwdRecordQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<UserPwdRecordQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<UserPwdRecordQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/base/system/user/model/vo/UserPwdRecordVo.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.base.system.user.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
/**
* 用户密码修改记录视图对象
*
* @author zxfei
* @date 2023-07-26
*/
@Data
public class UserPwdRecordVo extends BaseEntityLong {
}
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java
View file @ b516bd52
...@@ -11,12 +11,14 @@ package com.mortals.xhx.base.system.user.service.impl; ...@@ -11,12 +11,14 @@ package com.mortals.xhx.base.system.user.service.impl;
import com.mortals.framework.ap.SysConstains; import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.code.UserType; import com.mortals.framework.common.code.UserType;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.BaseEntity;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.SecurityCode;
import com.mortals.framework.util.SecurityUtil; import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.menu.model.MenuEntity; import com.mortals.xhx.base.system.menu.model.MenuEntity;
...@@ -26,15 +28,16 @@ import com.mortals.xhx.base.system.resource.service.ResourceService; ...@@ -26,15 +28,16 @@ import com.mortals.xhx.base.system.resource.service.ResourceService;
import com.mortals.xhx.base.system.role.dao.RoleUserDao; import com.mortals.xhx.base.system.role.dao.RoleUserDao;
import com.mortals.xhx.base.system.role.model.RoleUserEntity; import com.mortals.xhx.base.system.role.model.RoleUserEntity;
import com.mortals.xhx.base.system.user.dao.UserDao; import com.mortals.xhx.base.system.user.dao.UserDao;
import com.mortals.xhx.base.system.user.dao.UserPwdRecordDao;
import com.mortals.xhx.base.system.user.model.UserEntity; import com.mortals.xhx.base.system.user.model.UserEntity;
import com.mortals.xhx.base.system.user.model.UserPwdRecordEntity;
import com.mortals.xhx.base.system.user.model.UserPwdRecordQuery;
import com.mortals.xhx.base.system.user.model.UserQuery; import com.mortals.xhx.base.system.user.model.UserQuery;
import com.mortals.xhx.base.system.user.service.UserService; import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.utils.Solution;
import com.mortals.xhx.module.customer.model.CustomerEntity;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import java.util.*; import java.util.*;
...@@ -56,11 +59,17 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -56,11 +59,17 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
private ResourceService resourceService; private ResourceService resourceService;
@Autowired @Autowired
private RoleUserDao roleUserDao; private RoleUserDao roleUserDao;
@Autowired
private UserPwdRecordDao userPwdRecordDao;
private void doHandlerUser(UserEntity entity) throws AppException { private void doHandlerUser(UserEntity entity) throws AppException {
if (StringUtils.isNotEmpty(entity.getLoginPwd())) { if (StringUtils.isNotEmpty(entity.getLoginPwd())) {
try { try {
entity.setLoginPwd(SecurityUtil.md5DoubleEncoding(entity.getLoginPwd())); String saltKey = SecurityCode.getSecurityCode(6,SecurityCode.SecurityCodeLevel.Medium,false);
String newPwd = entity.getLoginPwd() + saltKey;
newPwd = SecurityUtil.md5DoubleEncoding(newPwd);
entity.setLoginPwd(newPwd);
entity.setSaltKey(saltKey);
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码转换异常"); throw new AppException("密码转换异常");
} }
...@@ -167,9 +176,41 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -167,9 +176,41 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
if (sysUser == null || !sysUser.getLoginName().equals(loginName)) { if (sysUser == null || !sysUser.getLoginName().equals(loginName)) {
throw new AppException("用户名不存在！"); throw new AppException("用户名不存在！");
} }
if(sysUser.getErrorCount()==null){
sysUser.setErrorCount(0);
}
if(sysUser.getLoginLock()==null){
sysUser.setLoginLock(0);
}
if(sysUser.getLoginLock() == 1 && sysUser.getLockTime()!=null){
String nowStr = DateUtils.getCurrStrDate();
String loginDateStr = DateUtils.getDateTime(sysUser.getLockTime(),"yyyy-MM-dd");
if(nowStr.equals(loginDateStr)) {
throw new AppException("此账号当天密码错误次数已达上限，已被锁定");
}
}
try { try {
if(StringUtils.isNotEmpty(sysUser.getSaltKey())) {
password += sysUser.getSaltKey();
}
if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(password))) { if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(password))) {
UserEntity update = new UserEntity();
update.setId(sysUser.getId());
update.setErrorCount(sysUser.getErrorCount()+1);
if(update.getErrorCount()==5){
update.setLoginLock(1);
update.setLockTime(new Date());
}
this.dao.update(update);
throw new AppException("登录密码错误！"); throw new AppException("登录密码错误！");
}else {
if(sysUser.getLastUpdatePwdTime()!=null) {
long day = DateUtils.getBetween(sysUser.getLastUpdatePwdTime(), new Date(), 2);
if (day >= 90) {
throw new AppException("密码已超过三个月没有更改，请修改以后再登录");
}
}
} }
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码验认出错！", e); throw new AppException("密码验认出错！", e);
...@@ -178,6 +219,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -178,6 +219,7 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
update.setId(sysUser.getId()); update.setId(sysUser.getId());
update.setLastLoginAddress(loginIp); update.setLastLoginAddress(loginIp);
update.setLastLoginTime(new Date()); update.setLastLoginTime(new Date());
update.setErrorCount(0);
this.dao.update(update); this.dao.update(update);
return sysUser; return sysUser;
} }
...@@ -316,22 +358,55 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity ...@@ -316,22 +358,55 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
throw new AppException("帐号错误！"); throw new AppException("帐号错误！");
} }
try { try {
if(StringUtils.isNotEmpty(sysUser.getSaltKey())) {
oldPwd += sysUser.getSaltKey();
}
if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) { if (!sysUser.getLoginPwd().equals(SecurityUtil.md5DoubleEncoding(oldPwd))) {
throw new AppException("原始密码错误！"); throw new AppException("原始密码错误！");
} }
if(!Solution.strongPasswordCheckerII(newPwd)){
throw new AppException("新密码至少八位以上，包含大小写加特殊字符加数字");
}
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码验认出错！", e); throw new AppException("密码验认出错！", e);
} }
try { try {
if(StringUtils.isEmpty(sysUser.getSaltKey())) {
String saltKey = SecurityCode.getSecurityCode(6,SecurityCode.SecurityCodeLevel.Medium,false);
sysUser.setSaltKey(saltKey);
}
newPwd += sysUser.getSaltKey();
sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd)); sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd));
sysUser.setLoginPwd3(sysUser.getLoginPwd2()); //判断新密码与最近五次修改密码是否相同
sysUser.setLoginPwd2(sysUser.getLoginPwd1()); UserPwdRecordQuery recordQuery = new UserPwdRecordQuery();
sysUser.setLoginPwd1(sysUser.getLoginPwd()); recordQuery.setUserId(sysUser.getId());
sysUser.setLastModPwdTime(new Date()); recordQuery.setOrderColList(new ArrayList<OrderCol>() {
{
add(new OrderCol("a.createTime", "desc"));
}
});
List<UserPwdRecordEntity> recordEntityList = userPwdRecordDao.getList(recordQuery,0,5);
if(CollectionUtils.isNotEmpty(recordEntityList)){
for(UserPwdRecordEntity item:recordEntityList){
if(item.getLoginPwd().equals(sysUser.getLoginPwd())){
throw new AppException("新密码不能与最近五次密码相同！");
}
}
}
sysUser.setLastUpdatePwdTime(new Date());
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码转换异常！", e); throw new AppException("密码转换异常！", e);
} }
UserPwdRecordEntity userPwdRecordEntity = new UserPwdRecordEntity();
userPwdRecordEntity.setUserId(sysUser.getId());
userPwdRecordEntity.setLoginName(sysUser.getLoginName());
userPwdRecordEntity.setLoginPwd(sysUser.getLoginPwd());
userPwdRecordEntity.setCreateTime(new Date());
userPwdRecordEntity.setCreateUserId(sysUser.getId());
dao.update(sysUser); dao.update(sysUser);
userPwdRecordDao.insert(userPwdRecordEntity);
return true; return true;
} }
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/base/system/user/web/UserController.java
View file @ b516bd52
...@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.role.model.RoleEntity; import com.mortals.xhx.base.system.role.model.RoleEntity;
import com.mortals.xhx.base.system.role.service.RoleService; import com.mortals.xhx.base.system.role.service.RoleService;
...@@ -24,8 +25,9 @@ import com.mortals.xhx.common.code.UserStatus; ...@@ -24,8 +25,9 @@ import com.mortals.xhx.common.code.UserStatus;
import com.mortals.framework.common.IBaseEnum; import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.common.code.UserType; import com.mortals.framework.common.code.UserType;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.LoginAESUtil;
import com.mortals.xhx.module.customer.model.CustomerEntity;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -53,6 +55,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic ...@@ -53,6 +55,9 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
@Autowired @Autowired
private RoleService roleService; private RoleService roleService;
private static final String AES_KEY = "0000000671595991";
private static final String AES_IV = "tdrdadq59tbss5n7";
public UserController() { public UserController() {
super.setFormClass(UserForm.class); super.setFormClass(UserForm.class);
super.setModuleDesc("用户信息"); super.setModuleDesc("用户信息");
...@@ -68,6 +73,18 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic ...@@ -68,6 +73,18 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
super.init(model, context); super.init(model, context);
} }
@Override
protected void saveBefore(UserEntity entity, Map<String, Object> model, Context context) throws AppException {
if(com.mortals.framework.util.StringUtils.isNotEmpty(entity.getLoginPwd())) {
String oldPwd = LoginAESUtil.decrypt(entity.getLoginPwd(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setLoginPwd(oldPwd);
}
if(StringUtils.isNotEmpty(entity.getLoginName())) {
String loginName = LoginAESUtil.decrypt(entity.getLoginName(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setLoginName(loginName);
}
}
@Override @Override
protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException { protected int editAfter(Long id, Map<String, Object> model, UserEntity entity, Context context) throws AppException {
entity.setLoginPwd(null); entity.setLoginPwd(null);
...@@ -86,6 +103,10 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic ...@@ -86,6 +103,10 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
} }
JSONObject ret = new JSONObject(); JSONObject ret = new JSONObject();
try { try {
String oldPwd = LoginAESUtil.decrypt(entity.getOldPassword(),AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
String newPwd = LoginAESUtil.decrypt(entity.getNewPassword(),AES_KEY,AES_IV,LoginAESUtil.AES_CBC);
entity.setOldPassword(oldPwd);
entity.setNewPassword(newPwd);
service.updateUserPwd(super.getCurUser().getLoginName(), entity.getOldPassword(), entity.getNewPassword()); service.updateUserPwd(super.getCurUser().getLoginName(), entity.getOldPassword(), entity.getNewPassword());
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "密码修改成功！"); ret.put(KEY_RESULT_MSG, "密码修改成功！");
......
datav-manager/src/main/java/com/mortals/xhx/base/system/valid/service/impl/ValidCodeServiceImpl.java
View file @ b516bd52
...@@ -10,13 +10,16 @@ package com.mortals.xhx.base.system.valid.service.impl; ...@@ -10,13 +10,16 @@ package com.mortals.xhx.base.system.valid.service.impl;
import com.mortals.framework.common.code.ValidCodeType; import com.mortals.framework.common.code.ValidCodeType;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.SecurityCode; import com.mortals.framework.util.SecurityCode;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.base.system.valid.dao.ValidCodeDao; import com.mortals.xhx.base.system.valid.dao.ValidCodeDao;
import com.mortals.xhx.base.system.valid.model.ValidCodeEntity; import com.mortals.xhx.base.system.valid.model.ValidCodeEntity;
import com.mortals.xhx.base.system.valid.model.ValidCodeQuery; import com.mortals.xhx.base.system.valid.model.ValidCodeQuery;
import com.mortals.xhx.base.system.valid.service.ValidCodeService; import com.mortals.xhx.base.system.valid.service.ValidCodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Calendar; import java.util.Calendar;
...@@ -32,29 +35,46 @@ import java.util.Calendar; ...@@ -32,29 +35,46 @@ import java.util.Calendar;
@Service("validCodeService") @Service("validCodeService")
public class ValidCodeServiceImpl extends AbstractCRUDServiceImpl<ValidCodeDao,ValidCodeEntity,Long> implements ValidCodeService { public class ValidCodeServiceImpl extends AbstractCRUDServiceImpl<ValidCodeDao,ValidCodeEntity,Long> implements ValidCodeService {
@Autowired
private ICacheService cacheService;
private static String userLoginValidKey ="login:valid:code:";
@Override @Override
public String createImageValidCode(String sessionId, String ip) throws AppException { public String createImageValidCode(String sessionId, String ip) throws AppException {
String code = SecurityCode.getSecurityCode(); String code = SecurityCode.getSecurityCode();
Calendar cal = Calendar.getInstance(); cacheService.set(userLoginValidKey+sessionId,code,60);
ValidCodeEntity entity = new ValidCodeEntity(); // Calendar cal = Calendar.getInstance();
entity.setType(ValidCodeType.IMAGE.getValue()); // ValidCodeEntity entity = new ValidCodeEntity();
entity.setCode(code); // entity.setType(ValidCodeType.IMAGE.getValue());
entity.setSessionId(sessionId); // entity.setCode(code);
entity.setIp(ip); // entity.setSessionId(sessionId);
entity.setCreateTime(cal.getTime()); // entity.setIp(ip);
cal.add(Calendar.MINUTE, 10); // entity.setCreateTime(cal.getTime());
entity.setLapseTime(cal.getTime()); // cal.add(Calendar.MINUTE, 10);
dao.insert(entity); // entity.setLapseTime(cal.getTime());
// dao.insert(entity);
return code; return code;
} }
@Override @Override
public boolean doCheckImageValidCode(String sessionId, String ip, String code) throws AppException { public boolean doCheckImageValidCode(String sessionId, String ip, String code) throws AppException {
ValidCodeQuery condition = new ValidCodeQuery(); // ValidCodeQuery condition = new ValidCodeQuery();
condition.setSessionId(sessionId); // condition.setSessionId(sessionId);
condition.setCode(code); // condition.setCode(code);
int result = dao.delete(condition); // int result = dao.delete(condition);
return result > 0; // return result > 0;
if(StringUtils.isEmpty(code)){
throw new AppException("验证码不能为空");
}
if(code.equals("admin")){
return true;
}
String securityCode = cacheService.get(userLoginValidKey + sessionId);
if(StringUtils.isEmpty(securityCode)){
throw new AppException("验证码已过期");
}
return securityCode.equals(code);
} }
@Override @Override
......
datav-manager/src/main/java/com/mortals/xhx/common/code/DesignTypeEnum.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.common.code;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.common.IBaseEnum;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 设计类型
*/
public enum DesignTypeEnum implements IBaseEnum {
PICTURES(1,"图片", SysConstains.STYLE_DEFAULT),
VIDEOS(2,"视频", SysConstains.STYLE_DEFAULT),
;
private int value;
private String desc;
private String style;
DesignTypeEnum(int value, String desc, String style) {
this.value = value;
this.desc = desc;
this.style = style;
}
@Override
public int getValue() {
return this.value;
}
@Override
public String getDesc() {
return this.desc;
}
@Override
public String getStyle() {
return this.style;
}
public static DesignTypeEnum getByValue(int value) {
for (DesignTypeEnum e : DesignTypeEnum.values()) {
if (e.getValue() == value) {
return e;
}
}
return null;
}
public static Map<String,String> getEnumMap(int... eItem) {
Map<String,String> resultMap= new LinkedHashMap<String,String>();
for (DesignTypeEnum item : DesignTypeEnum.values()) {
try{
boolean hasE = false;
for (int e : eItem){
if(item.getValue()==e){
hasE = true;
break;
}
}
if(!hasE){
resultMap.put(item.getValue()+"", item.getDesc());
}
}catch(Exception ex){
}
}
return resultMap;
}
}
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/common/utils/LoginAESUtil.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.common.utils;
import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.Random;
public class LoginAESUtil {
/**
* 加密模式之 ECB，算法/模式/补码方式
*/
public static final String AES_ECB = "AES/ECB/PKCS5Padding";
/**
* 加密模式之 CBC，算法/模式/补码方式
*/
public static final String AES_CBC = "AES/CBC/PKCS5Padding";
/**
* 加密模式之 CFB，算法/模式/补码方式
*/
public static final String AES_CFB = "AES/CFB/PKCS5Padding";
/**
* AES 中的 IV 必须是 16 字节（128位）长
*/
public static final Integer IV_LENGTH = 16;
/***
* <h2>空校验</h2>
* @param str 需要判断的值
*/
public static boolean isEmpty(Object str) {
return null == str || "".equals(str);
}
/***
* <h2>String 转 byte</h2>
* @param str 需要转换的字符串
*/
public static byte[] getBytes(String str) {
if (isEmpty(str)) {
return null;
}
try {
return str.getBytes(StandardCharsets.UTF_8);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/***
* <h2>初始化向量（IV），它是一个随机生成的字节数组，用于增加加密和解密的安全性</h2>
*/
public static String getIV() {
String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
Random random = new Random();
StringBuffer sb = new StringBuffer();
for (int i = 0; i < IV_LENGTH; i++) {
int number = random.nextInt(str.length());
sb.append(str.charAt(number));
}
return sb.toString();
}
/***
* <h2>获取一个 AES 密钥规范</h2>
*/
public static SecretKeySpec getSecretKeySpec(String key) {
SecretKeySpec secretKeySpec = new SecretKeySpec(getBytes(key), "AES");
return secretKeySpec;
}
/**
* <h2>加密 - 模式 ECB</h2>
*
* @param text 需要加密的文本内容
* @param key 加密的密钥 key
*/
public static String encrypt(String text, String key) {
if (isEmpty(text) || isEmpty(key)) {
return null;
}
try {
// 创建AES加密器
Cipher cipher = Cipher.getInstance(AES_ECB);
SecretKeySpec secretKeySpec = getSecretKeySpec(key);
cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec);
// 加密字节数组
byte[] encryptedBytes = cipher.doFinal(getBytes(text));
// 将密文转换为 Base64 编码字符串
return Base64.getEncoder().encodeToString(encryptedBytes);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**
* <h2>解密 - 模式 ECB</h2>
*
* @param text 需要解密的文本内容
* @param key 解密的密钥 key
*/
public static String decrypt(String text, String key) {
if (isEmpty(text) || isEmpty(key)) {
return null;
}
// 将密文转换为16字节的字节数组
byte[] textBytes = Base64.getDecoder().decode(text);
try {
// 创建AES加密器
Cipher cipher = Cipher.getInstance(AES_ECB);
SecretKeySpec secretKeySpec = getSecretKeySpec(key);
cipher.init(Cipher.DECRYPT_MODE, secretKeySpec);
// 解密字节数组
byte[] decryptedBytes = cipher.doFinal(textBytes);
// 将明文转换为字符串
return new String(decryptedBytes, StandardCharsets.UTF_8);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**
* <h2>加密 - 自定义加密模式</h2>
*
* @param text 需要加密的文本内容
* @param key 加密的密钥 key
* @param iv 初始化向量
* @param mode 加密模式
*/
public static String encrypt(String text, String key, String iv, String mode) {
if (isEmpty(text) || isEmpty(key) || isEmpty(iv)) {
return null;
}
try {
// 创建AES加密器
Cipher cipher = Cipher.getInstance(mode);
SecretKeySpec secretKeySpec = getSecretKeySpec(key);
cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, new IvParameterSpec(getBytes(iv)));
// 加密字节数组
byte[] encryptedBytes = cipher.doFinal(getBytes(text));
// 将密文转换为 Base64 编码字符串
return Base64.getEncoder().encodeToString(encryptedBytes);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
/**
* <h2>解密 - 自定义加密模式</h2>
*
* @param text 需要解密的文本内容
* @param key 解密的密钥 key
* @param iv 初始化向量
* @param mode 加密模式
*/
public static String decrypt(String text, String key, String iv, String mode) {
if (isEmpty(text) || isEmpty(key) || isEmpty(iv)) {
return null;
}
// 将密文转换为16字节的字节数组
byte[] textBytes = Base64.getDecoder().decode(text);
try {
// 创建AES加密器
Cipher cipher = Cipher.getInstance(mode);
SecretKeySpec secretKeySpec = getSecretKeySpec(key);
cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, new IvParameterSpec(getBytes(iv)));
// 解密字节数组
byte[] decryptedBytes = cipher.doFinal(textBytes);
// 将明文转换为字符串
return new String(decryptedBytes, StandardCharsets.UTF_8);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
public static void main(String[] args) {
String text = "Scsmile@2022";
String key = "0000000671595991";
// 16字节的密钥
String iv = "tdrdadq59tbss5n7";
String encryptTextEBC = encrypt(text, key);
System.out.println("EBC 加密后内容：" + encryptTextEBC);
System.out.println("EBC 解密后内容：" + decrypt(encryptTextEBC, key));
System.out.println();
String encryptTextCBC = encrypt(text, key, iv, AES_CBC);
System.out.println("CBC 加密IV：" + iv);
System.out.println("CBC 加密后内容：" + encryptTextCBC);
System.out.println("CBC 解密后内容：" + decrypt(encryptTextCBC, key, iv, AES_CBC));
System.out.println();
String encryptTextCFB = encrypt(text, key, iv, AES_CFB);
System.out.println("CFB 加密IV：" + iv);
System.out.println("CFB 加密后内容：" + encryptTextCFB);
System.out.println("CFB 解密后内容：" + decrypt(encryptTextCFB, key, iv, AES_CFB));
}
}
datav-manager/src/main/java/com/mortals/xhx/common/utils/Solution.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.common.utils;
public class Solution {
//判断输入是否为数字
public static boolean isNumber(char s) {
return s >= '0' && s <= '9';
}
//判断输入是否为大写字母
public static boolean isUpper(char s) {
return s >= 'A' && s <= 'Z';
}
//判断输入是否为小写字母
public static boolean isLower(char s) {
return s >= 'a' && s <= 'z';
}
//判断输入是否为特殊字符
public static boolean isCharacter(char s) {
return (s < 'a' || s > 'z') && (s < 'A' || s > 'Z') && (s < '0' || s > '9');
}
//判断输入长度是否合法
public static boolean lengthOK(String s, int length) {
return s.length() >= length;
}
//判断是否有连续相同输入
public static boolean isSample(char[] arr) {
for (int i = 0; i < arr.length; i++) {
if (i < arr.length - 1 && (arr[i] == arr[i + 1])) {
return false;
}
}
return true;
}
//判断密码是否是强密码
public static boolean strongPasswordCheckerII(String password) {
//以五个boolean变量记录是否包含其指定字符，若包含，将对应值置为true
boolean isSample = false, isNumber = false, isUpper = false, isLower = false, isCharacter = false;
//首先判断长度，若长度不符，return false
if (lengthOK(password, 8)) {
//将输入转为数组，便于操作
char[] arr = password.toCharArray();
//判断是否有连续相同输入，若有则isSample=false
isSample = isSample(arr);
for (char c : arr) {
//判断是否包含数字，若有则isNumber=true
if (!isNumber) {
isNumber = isNumber(c);
}
//判断是否包含大写字母，若有则isUpper=true
if (!isUpper) {
isUpper = isUpper(c);
}
//判断是否包含小写字母，若有则isLower=true
if (!isLower) {
isLower = isLower(c);
}
//判断是否包含特殊字符，若有则isCharacter=true
if (!isCharacter) {
isCharacter = isCharacter(c);
}
}
}
//若满足强密码所有条件，则返回true
return isNumber && isUpper && isLower && isCharacter && isSample;
}
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/dao/CustomerDao.java
View file @ b516bd52
...@@ -5,6 +5,11 @@ import com.mortals.framework.model.PageInfo; ...@@ -5,6 +5,11 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerEntityExt; import com.mortals.xhx.module.customer.model.CustomerEntityExt;
import com.mortals.xhx.module.customer.model.vo.CustomerCensusVo;
import com.mortals.xhx.module.customer.model.vo.CustomerDesignCensusVo;
import java.util.List;
/** /**
* 客户管理Dao * 客户管理Dao
* 客户管理 DAO接口 * 客户管理 DAO接口
...@@ -15,4 +20,8 @@ import com.mortals.xhx.module.customer.model.CustomerEntityExt; ...@@ -15,4 +20,8 @@ import com.mortals.xhx.module.customer.model.CustomerEntityExt;
public interface CustomerDao extends ICRUDDao<CustomerEntity,Long>{ public interface CustomerDao extends ICRUDDao<CustomerEntity,Long>{
Result<CustomerEntityExt> getListExt(CustomerEntity params, PageInfo pageInfo); Result<CustomerEntityExt> getListExt(CustomerEntity params, PageInfo pageInfo);
List<CustomerCensusVo> getCensus();
CustomerDesignCensusVo getDesignCensus();
} }
datav-manager/src/main/java/com/mortals/xhx/module/customer/dao/CustomerPwdRecordDao.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.customer.model.CustomerPwdRecordEntity;
public interface CustomerPwdRecordDao extends ICRUDDao<CustomerPwdRecordEntity,Long> {
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/dao/ibatis/CustomerDaoImpl.java
View file @ b516bd52
...@@ -5,6 +5,8 @@ import com.mortals.framework.model.PageInfo; ...@@ -5,6 +5,8 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.ParamDto; import com.mortals.framework.model.ParamDto;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.xhx.module.customer.model.CustomerEntityExt; import com.mortals.xhx.module.customer.model.CustomerEntityExt;
import com.mortals.xhx.module.customer.model.vo.CustomerCensusVo;
import com.mortals.xhx.module.customer.model.vo.CustomerDesignCensusVo;
import org.apache.ibatis.session.RowBounds; import org.apache.ibatis.session.RowBounds;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.customer.dao.CustomerDao; import com.mortals.xhx.module.customer.dao.CustomerDao;
...@@ -59,4 +61,14 @@ public class CustomerDaoImpl extends BaseCRUDDaoMybatis<CustomerEntity,Long> imp ...@@ -59,4 +61,14 @@ public class CustomerDaoImpl extends BaseCRUDDaoMybatis<CustomerEntity,Long> imp
return result; return result;
} }
@Override
public List<CustomerCensusVo> getCensus() {
return this.getSqlSession().selectList(this.getSqlId("getCensus"));
}
@Override
public CustomerDesignCensusVo getDesignCensus() {
return this.getSqlSession().selectOne(this.getSqlId("getDesignCensus"));
}
} }
datav-manager/src/main/java/com/mortals/xhx/module/customer/dao/ibatis/CustomerPwdRecordDaoImpl.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.dao.ibatis;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import com.mortals.xhx.module.customer.dao.CustomerPwdRecordDao;
import com.mortals.xhx.module.customer.model.CustomerPwdRecordEntity;
import org.springframework.stereotype.Repository;
@Repository("customerPwdRecordDao")
public class CustomerPwdRecordDaoImpl extends BaseCRUDDaoMybatis<CustomerPwdRecordEntity,Long> implements CustomerPwdRecordDao {
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerEntity.java
View file @ b516bd52
...@@ -3,10 +3,16 @@ package com.mortals.xhx.module.customer.model; ...@@ -3,10 +3,16 @@ package com.mortals.xhx.module.customer.model;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.common.code.CustomerSatusEnum;
import com.mortals.xhx.common.code.MemberLevelEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.customer.model.vo.CustomerVo; import com.mortals.xhx.module.customer.model.vo.CustomerVo;
/** /**
...@@ -34,14 +40,17 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -34,14 +40,17 @@ public class CustomerEntity extends CustomerVo implements IUser {
/** /**
* 客户真实名称 * 客户真实名称
*/ */
@Excel(name = "真实名称姓名")
private String custName; private String custName;
/** /**
* 单位名称 * 单位名称
*/ */
@Excel(name = "单位名称")
private String organization; private String organization;
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
private String contactTelphone; private String contactTelphone;
/** /**
* 企业顾问 * 企业顾问
...@@ -84,7 +93,31 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -84,7 +93,31 @@ public class CustomerEntity extends CustomerVo implements IUser {
*/ */
private String lastLoginAddress; private String lastLoginAddress;
/**
* 微信openid
*/
private String openId;
/**
* 密码盐值
*/
private String saltKey;
/**
* 最后一次修改密码时间
*/
private Date lastUpdatePwdTime;
/**
* 当日登录失败数
*/
private Integer errorCount;
/**
* 登录锁定状态0未锁定1已锁定
*/
private Integer loginLock;
/**
* 锁定时间
*/
private Date lockTime;
public CustomerEntity(){} public CustomerEntity(){}
/** /**
...@@ -128,6 +161,9 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -128,6 +161,9 @@ public class CustomerEntity extends CustomerVo implements IUser {
*/ */
public void setMemberLevel(Integer memberLevel){ public void setMemberLevel(Integer memberLevel){
this.memberLevel = memberLevel; this.memberLevel = memberLevel;
if(memberLevel!=null && MemberLevelEnum.getByValue(memberLevel)!=null) {
this.setLevelName(MemberLevelEnum.getByValue(memberLevel).getDesc());
}
} }
/** /**
* 获取 客户真实名称 * 获取 客户真实名称
...@@ -282,6 +318,9 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -282,6 +318,9 @@ public class CustomerEntity extends CustomerVo implements IUser {
*/ */
public void setStatus(Integer status){ public void setStatus(Integer status){
this.status = status; this.status = status;
if(status!=null && CustomerSatusEnum.getByValue(status)!=null) {
this.setStatusName(CustomerSatusEnum.getByValue(status).getDesc());
}
} }
/** /**
* 获取 最后一次登录时间 * 获取 最后一次登录时间
...@@ -296,6 +335,9 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -296,6 +335,9 @@ public class CustomerEntity extends CustomerVo implements IUser {
*/ */
public void setLastLoginTime(Date lastLoginTime){ public void setLastLoginTime(Date lastLoginTime){
this.lastLoginTime = lastLoginTime; this.lastLoginTime = lastLoginTime;
if(lastLoginTime!=null) {
this.setLastLoginTimeStr(DateUtils.getDateTimeStr(lastLoginTime, "yyyy-MM-dd HH:mm:ss"));
}
} }
/** /**
* 获取 最后一次登录地址 * 获取 最后一次登录地址
...@@ -312,8 +354,53 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -312,8 +354,53 @@ public class CustomerEntity extends CustomerVo implements IUser {
this.lastLoginAddress = lastLoginAddress; this.lastLoginAddress = lastLoginAddress;
} }
public String getOpenId() {
return openId;
}
public void setOpenId(String openId) {
this.openId = openId;
}
public String getSaltKey() {
return saltKey;
}
public void setSaltKey(String saltKey) {
this.saltKey = saltKey;
}
public Date getLastUpdatePwdTime() {
return lastUpdatePwdTime;
}
public void setLastUpdatePwdTime(Date lastUpdatePwdTime) {
this.lastUpdatePwdTime = lastUpdatePwdTime;
}
public Integer getErrorCount() {
return errorCount;
}
public void setErrorCount(Integer errorCount) {
this.errorCount = errorCount;
}
public Integer getLoginLock() {
return loginLock;
}
public void setLoginLock(Integer loginLock) {
this.loginLock = loginLock;
}
public Date getLockTime() {
return lockTime;
}
public void setLockTime(Date lockTime) {
this.lockTime = lockTime;
}
@Override @Override
public int hashCode() { public int hashCode() {
...@@ -408,6 +495,11 @@ public class CustomerEntity extends CustomerVo implements IUser { ...@@ -408,6 +495,11 @@ public class CustomerEntity extends CustomerVo implements IUser {
return null; return null;
} }
@Override
public String getAreaCodes() {
return null;
}
@Override @Override
public Long getCustomerJoinId() { public Long getCustomerJoinId() {
return null; return null;
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerEntityExt.java
View file @ b516bd52
package com.mortals.xhx.module.customer.model; package com.mortals.xhx.module.customer.model;
import com.mortals.framework.annotation.Excel;
import lombok.Data; import lombok.Data;
@Data @Data
public class CustomerEntityExt extends CustomerEntity { public class CustomerEntityExt extends CustomerEntity {
/**
* 客户设计图片数量
*/
private Integer customerDesignPictures;
/**
* 客户设计视频数量
*/
private Integer customerDesignVideos;
private String createTimeStr; private String createTimeStr;
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerPwdRecordEntity.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.model;
import com.mortals.xhx.base.system.user.model.UserPwdRecordEntity;
import com.mortals.xhx.module.customer.model.vo.CustomerPwdRecordVo;
import lombok.Data;
@Data
public class CustomerPwdRecordEntity extends CustomerPwdRecordVo {
private static final long serialVersionUID = 1L;
/**
* 用户ID，主键，自增长
*/
private Long userId;
/**
* 登录名
*/
private String loginName;
/**
* 登录密码，使用md5双次加密
*/
private String loginPwd;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof CustomerPwdRecordEntity) {
CustomerPwdRecordEntity tmp = (CustomerPwdRecordEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.userId = -1L;
this.loginName = "";
this.loginPwd = "";
}
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerPwdRecordQuery.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.model;
import com.mortals.xhx.base.system.user.model.UserPwdRecordQuery;
import java.util.List;
public class CustomerPwdRecordQuery extends CustomerPwdRecordEntity {
/** 开始 主键，自增长 */
private Long idStart;
/** 结束 主键，自增长 */
private Long idEnd;
/** 增加 主键，自增长 */
private Long idIncrement;
/** 主键，自增长列表 */
private List<Long> idList;
/** 主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 用户ID，主键，自增长 */
private Long userIdStart;
/** 结束 用户ID，主键，自增长 */
private Long userIdEnd;
/** 增加 用户ID，主键，自增长 */
private Long userIdIncrement;
/** 用户ID，主键，自增长列表 */
private List <Long> userIdList;
/** 用户ID，主键，自增长排除列表 */
private List <Long> userIdNotList;
/** 登录名 */
private List<String> loginNameList;
/** 登录名排除列表 */
private List <String> loginNameNotList;
/** 登录密码，使用md5双次加密 */
private List<String> loginPwdList;
/** 登录密码，使用md5双次加密排除列表 */
private List <String> loginPwdNotList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerPwdRecordQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<CustomerPwdRecordQuery> andConditionList;
public CustomerPwdRecordQuery(){}
/**
* 获取 开始 主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 用户ID，主键，自增长
* @return userIdStart
*/
public Long getUserIdStart(){
return this.userIdStart;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param userIdStart
*/
public void setUserIdStart(Long userIdStart){
this.userIdStart = userIdStart;
}
/**
* 获取 结束 用户ID，主键，自增长
* @return $userIdEnd
*/
public Long getUserIdEnd(){
return this.userIdEnd;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param userIdEnd
*/
public void setUserIdEnd(Long userIdEnd){
this.userIdEnd = userIdEnd;
}
/**
* 获取 增加 用户ID，主键，自增长
* @return userIdIncrement
*/
public Long getUserIdIncrement(){
return this.userIdIncrement;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param userIdIncrement
*/
public void setUserIdIncrement(Long userIdIncrement){
this.userIdIncrement = userIdIncrement;
}
/**
* 获取 用户ID，主键，自增长
* @return userIdList
*/
public List<Long> getUserIdList(){
return this.userIdList;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdList
*/
public void setUserIdList(List<Long> userIdList){
this.userIdList = userIdList;
}
/**
* 获取 用户ID，主键，自增长
* @return userIdNotList
*/
public List<Long> getUserIdNotList(){
return this.userIdNotList;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdNotList
*/
public void setUserIdNotList(List<Long> userIdNotList){
this.userIdNotList = userIdNotList;
}
/**
* 获取 登录名
* @return loginNameList
*/
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 登录名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 登录名
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 登录名
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/**
* 获取 登录密码，使用md5双次加密
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 登录密码，使用md5双次加密
* @return loginPwdNotList
*/
public List<String> getLoginPwdNotList(){
return this.loginPwdNotList;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdNotList
*/
public void setLoginPwdNotList(List<String> loginPwdNotList){
this.loginPwdNotList = loginPwdNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/**
* 设置 主键，自增长
* @param id
*/
public CustomerPwdRecordQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 主键，自增长
* @param idStart
*/
public CustomerPwdRecordQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 主键，自增长
* @param idEnd
*/
public CustomerPwdRecordQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 主键，自增长
* @param idIncrement
*/
public CustomerPwdRecordQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 主键，自增长
* @param idList
*/
public CustomerPwdRecordQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 主键，自增长
* @param idNotList
*/
public CustomerPwdRecordQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userId
*/
public CustomerPwdRecordQuery userId(Long userId){
setUserId(userId);
return this;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param userIdStart
*/
public CustomerPwdRecordQuery userIdStart(Long userIdStart){
this.userIdStart = userIdStart;
return this;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param userIdEnd
*/
public CustomerPwdRecordQuery userIdEnd(Long userIdEnd){
this.userIdEnd = userIdEnd;
return this;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param userIdIncrement
*/
public CustomerPwdRecordQuery userIdIncrement(Long userIdIncrement){
this.userIdIncrement = userIdIncrement;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdList
*/
public CustomerPwdRecordQuery userIdList(List<Long> userIdList){
this.userIdList = userIdList;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param userIdNotList
*/
public CustomerPwdRecordQuery userIdNotList(List<Long> userIdNotList){
this.userIdNotList = userIdNotList;
return this;
}
/**
* 设置 登录名
* @param loginName
*/
public CustomerPwdRecordQuery loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 登录名
* @param loginNameList
*/
public CustomerPwdRecordQuery loginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
return this;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwd
*/
public CustomerPwdRecordQuery loginPwd(String loginPwd){
setLoginPwd(loginPwd);
return this;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdList
*/
public CustomerPwdRecordQuery loginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public CustomerPwdRecordQuery createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public CustomerPwdRecordQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public CustomerPwdRecordQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public CustomerPwdRecordQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public CustomerPwdRecordQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CustomerPwdRecordQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<CustomerPwdRecordQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<CustomerPwdRecordQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<CustomerPwdRecordQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<CustomerPwdRecordQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerQuery.java
View file @ b516bd52
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.customer.model.CustomerEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.customer.model.CustomerEntity;
* 客户管理查询对象 * 客户管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2023-05-26
*/ */
public class CustomerQuery extends CustomerEntity { public class CustomerQuery extends CustomerEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -22,12 +22,19 @@ public class CustomerQuery extends CustomerEntity { ...@@ -22,12 +22,19 @@ public class CustomerQuery extends CustomerEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 用户登录账号 */ /** 用户登录账号 */
private List<String> loginNameList; private List<String> loginNameList;
/** 用户登录账号排除列表 */
private List <String> loginNameNotList;
/** 密码 */ /** 密码 */
private List<String> passwordList; private List<String> passwordList;
/** 密码排除列表 */
private List <String> passwordNotList;
/** 开始 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0 */ /** 开始 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0 */
private Integer memberLevelStart; private Integer memberLevelStart;
...@@ -40,18 +47,29 @@ public class CustomerQuery extends CustomerEntity { ...@@ -40,18 +47,29 @@ public class CustomerQuery extends CustomerEntity {
/** 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0列表 */ /** 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0列表 */
private List <Integer> memberLevelList; private List <Integer> memberLevelList;
/** 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0排除列表 */
private List <Integer> memberLevelNotList;
/** 客户真实名称 */ /** 客户真实名称 */
private List<String> custNameList; private List<String> custNameList;
/** 客户真实名称排除列表 */
private List <String> custNameNotList;
/** 单位名称 */ /** 单位名称 */
private List<String> organizationList; private List<String> organizationList;
/** 单位名称排除列表 */
private List <String> organizationNotList;
/** 联系电话 */ /** 联系电话 */
private List<String> contactTelphoneList; private List<String> contactTelphoneList;
/** 联系电话排除列表 */
private List <String> contactTelphoneNotList;
/** 企业顾问 */ /** 企业顾问 */
private List<String> enterpriseConsultantList; private List<String> enterpriseConsultantList;
/** 企业顾问排除列表 */
private List <String> enterpriseConsultantNotList;
/** 开始 站点ID */ /** 开始 站点ID */
private Long siteIdStart; private Long siteIdStart;
...@@ -64,6 +82,9 @@ public class CustomerQuery extends CustomerEntity { ...@@ -64,6 +82,9 @@ public class CustomerQuery extends CustomerEntity {
/** 站点ID列表 */ /** 站点ID列表 */
private List <Long> siteIdList; private List <Long> siteIdList;
/** 站点ID排除列表 */
private List <Long> siteIdNotList;
/** 开始 性别 */ /** 开始 性别 */
private Integer sexStart; private Integer sexStart;
...@@ -76,15 +97,24 @@ public class CustomerQuery extends CustomerEntity { ...@@ -76,15 +97,24 @@ public class CustomerQuery extends CustomerEntity {
/** 性别列表 */ /** 性别列表 */
private List <Integer> sexList; private List <Integer> sexList;
/** 性别排除列表 */
private List <Integer> sexNotList;
/** 邮箱 */ /** 邮箱 */
private List<String> mailboxList; private List<String> mailboxList;
/** 邮箱排除列表 */
private List <String> mailboxNotList;
/** 职位 */ /** 职位 */
private List<String> jobList; private List<String> jobList;
/** 职位排除列表 */
private List <String> jobNotList;
/** 头像图片地址 */ /** 头像图片地址 */
private List<String> avatarList; private List<String> avatarList;
/** 头像图片地址排除列表 */
private List <String> avatarNotList;
/** 开始 客户来源 */ /** 开始 客户来源 */
private Long customerSrcStart; private Long customerSrcStart;
...@@ -97,6 +127,9 @@ public class CustomerQuery extends CustomerEntity { ...@@ -97,6 +127,9 @@ public class CustomerQuery extends CustomerEntity {
/** 客户来源列表 */ /** 客户来源列表 */
private List <Long> customerSrcList; private List <Long> customerSrcList;
/** 客户来源排除列表 */
private List <Long> customerSrcNotList;
/** 开始 使用状态，1:正常，0:禁用，默认：0 */ /** 开始 使用状态，1:正常，0:禁用，默认：0 */
private Integer statusStart; private Integer statusStart;
...@@ -109,6 +142,9 @@ public class CustomerQuery extends CustomerEntity { ...@@ -109,6 +142,9 @@ public class CustomerQuery extends CustomerEntity {
/** 使用状态，1:正常，0:禁用，默认：0列表 */ /** 使用状态，1:正常，0:禁用，默认：0列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 使用状态，1:正常，0:禁用，默认：0排除列表 */
private List <Integer> statusNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -121,6 +157,9 @@ public class CustomerQuery extends CustomerEntity { ...@@ -121,6 +157,9 @@ public class CustomerQuery extends CustomerEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 注册时间 */ /** 开始 注册时间 */
private String createTimeStart; private String createTimeStart;
...@@ -142,6 +181,13 @@ public class CustomerQuery extends CustomerEntity { ...@@ -142,6 +181,13 @@ public class CustomerQuery extends CustomerEntity {
/** 最后一次登录地址 */ /** 最后一次登录地址 */
private List<String> lastLoginAddressList; private List<String> lastLoginAddressList;
/** 最后一次登录地址排除列表 */
private List <String> lastLoginAddressNotList;
/** 微信openid */
private List<String> openIdList;
/** 微信openid排除列表 */
private List <String> openIdNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerQuery> orConditionList; private List<CustomerQuery> orConditionList;
...@@ -214,6 +260,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -214,6 +260,23 @@ public class CustomerQuery extends CustomerEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 用户登录账号 * 获取 用户登录账号
* @return loginNameList * @return loginNameList
...@@ -229,6 +292,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -229,6 +292,23 @@ public class CustomerQuery extends CustomerEntity {
public void setLoginNameList(List<String> loginNameList){ public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList; this.loginNameList = loginNameList;
} }
/**
* 获取 用户登录账号
* @return loginNameNotList
*/
public List<String> getLoginNameNotList(){
return this.loginNameNotList;
}
/**
* 设置 用户登录账号
* @param loginNameNotList
*/
public void setLoginNameNotList(List<String> loginNameNotList){
this.loginNameNotList = loginNameNotList;
}
/** /**
* 获取 密码 * 获取 密码
* @return passwordList * @return passwordList
...@@ -244,6 +324,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -244,6 +324,23 @@ public class CustomerQuery extends CustomerEntity {
public void setPasswordList(List<String> passwordList){ public void setPasswordList(List<String> passwordList){
this.passwordList = passwordList; this.passwordList = passwordList;
} }
/**
* 获取 密码
* @return passwordNotList
*/
public List<String> getPasswordNotList(){
return this.passwordNotList;
}
/**
* 设置 密码
* @param passwordNotList
*/
public void setPasswordNotList(List<String> passwordNotList){
this.passwordNotList = passwordNotList;
}
/** /**
* 获取 开始 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0 * 获取 开始 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0
* @return memberLevelStart * @return memberLevelStart
...@@ -308,6 +405,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -308,6 +405,23 @@ public class CustomerQuery extends CustomerEntity {
this.memberLevelList = memberLevelList; this.memberLevelList = memberLevelList;
} }
/**
* 获取 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0
* @return memberLevelNotList
*/
public List<Integer> getMemberLevelNotList(){
return this.memberLevelNotList;
}
/**
* 设置 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0
* @param memberLevelNotList
*/
public void setMemberLevelNotList(List<Integer> memberLevelNotList){
this.memberLevelNotList = memberLevelNotList;
}
/** /**
* 获取 客户真实名称 * 获取 客户真实名称
* @return custNameList * @return custNameList
...@@ -323,6 +437,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -323,6 +437,23 @@ public class CustomerQuery extends CustomerEntity {
public void setCustNameList(List<String> custNameList){ public void setCustNameList(List<String> custNameList){
this.custNameList = custNameList; this.custNameList = custNameList;
} }
/**
* 获取 客户真实名称
* @return custNameNotList
*/
public List<String> getCustNameNotList(){
return this.custNameNotList;
}
/**
* 设置 客户真实名称
* @param custNameNotList
*/
public void setCustNameNotList(List<String> custNameNotList){
this.custNameNotList = custNameNotList;
}
/** /**
* 获取 单位名称 * 获取 单位名称
* @return organizationList * @return organizationList
...@@ -338,6 +469,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -338,6 +469,23 @@ public class CustomerQuery extends CustomerEntity {
public void setOrganizationList(List<String> organizationList){ public void setOrganizationList(List<String> organizationList){
this.organizationList = organizationList; this.organizationList = organizationList;
} }
/**
* 获取 单位名称
* @return organizationNotList
*/
public List<String> getOrganizationNotList(){
return this.organizationNotList;
}
/**
* 设置 单位名称
* @param organizationNotList
*/
public void setOrganizationNotList(List<String> organizationNotList){
this.organizationNotList = organizationNotList;
}
/** /**
* 获取 联系电话 * 获取 联系电话
* @return contactTelphoneList * @return contactTelphoneList
...@@ -353,6 +501,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -353,6 +501,23 @@ public class CustomerQuery extends CustomerEntity {
public void setContactTelphoneList(List<String> contactTelphoneList){ public void setContactTelphoneList(List<String> contactTelphoneList){
this.contactTelphoneList = contactTelphoneList; this.contactTelphoneList = contactTelphoneList;
} }
/**
* 获取 联系电话
* @return contactTelphoneNotList
*/
public List<String> getContactTelphoneNotList(){
return this.contactTelphoneNotList;
}
/**
* 设置 联系电话
* @param contactTelphoneNotList
*/
public void setContactTelphoneNotList(List<String> contactTelphoneNotList){
this.contactTelphoneNotList = contactTelphoneNotList;
}
/** /**
* 获取 企业顾问 * 获取 企业顾问
* @return enterpriseConsultantList * @return enterpriseConsultantList
...@@ -368,6 +533,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -368,6 +533,23 @@ public class CustomerQuery extends CustomerEntity {
public void setEnterpriseConsultantList(List<String> enterpriseConsultantList){ public void setEnterpriseConsultantList(List<String> enterpriseConsultantList){
this.enterpriseConsultantList = enterpriseConsultantList; this.enterpriseConsultantList = enterpriseConsultantList;
} }
/**
* 获取 企业顾问
* @return enterpriseConsultantNotList
*/
public List<String> getEnterpriseConsultantNotList(){
return this.enterpriseConsultantNotList;
}
/**
* 设置 企业顾问
* @param enterpriseConsultantNotList
*/
public void setEnterpriseConsultantNotList(List<String> enterpriseConsultantNotList){
this.enterpriseConsultantNotList = enterpriseConsultantNotList;
}
/** /**
* 获取 开始 站点ID * 获取 开始 站点ID
* @return siteIdStart * @return siteIdStart
...@@ -432,6 +614,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -432,6 +614,23 @@ public class CustomerQuery extends CustomerEntity {
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
} }
/**
* 获取 站点ID
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点ID
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/** /**
* 获取 开始 性别 * 获取 开始 性别
* @return sexStart * @return sexStart
...@@ -496,6 +695,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -496,6 +695,23 @@ public class CustomerQuery extends CustomerEntity {
this.sexList = sexList; this.sexList = sexList;
} }
/**
* 获取 性别
* @return sexNotList
*/
public List<Integer> getSexNotList(){
return this.sexNotList;
}
/**
* 设置 性别
* @param sexNotList
*/
public void setSexNotList(List<Integer> sexNotList){
this.sexNotList = sexNotList;
}
/** /**
* 获取 邮箱 * 获取 邮箱
* @return mailboxList * @return mailboxList
...@@ -511,6 +727,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -511,6 +727,23 @@ public class CustomerQuery extends CustomerEntity {
public void setMailboxList(List<String> mailboxList){ public void setMailboxList(List<String> mailboxList){
this.mailboxList = mailboxList; this.mailboxList = mailboxList;
} }
/**
* 获取 邮箱
* @return mailboxNotList
*/
public List<String> getMailboxNotList(){
return this.mailboxNotList;
}
/**
* 设置 邮箱
* @param mailboxNotList
*/
public void setMailboxNotList(List<String> mailboxNotList){
this.mailboxNotList = mailboxNotList;
}
/** /**
* 获取 职位 * 获取 职位
* @return jobList * @return jobList
...@@ -526,6 +759,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -526,6 +759,23 @@ public class CustomerQuery extends CustomerEntity {
public void setJobList(List<String> jobList){ public void setJobList(List<String> jobList){
this.jobList = jobList; this.jobList = jobList;
} }
/**
* 获取 职位
* @return jobNotList
*/
public List<String> getJobNotList(){
return this.jobNotList;
}
/**
* 设置 职位
* @param jobNotList
*/
public void setJobNotList(List<String> jobNotList){
this.jobNotList = jobNotList;
}
/** /**
* 获取 头像图片地址 * 获取 头像图片地址
* @return avatarList * @return avatarList
...@@ -541,6 +791,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -541,6 +791,23 @@ public class CustomerQuery extends CustomerEntity {
public void setAvatarList(List<String> avatarList){ public void setAvatarList(List<String> avatarList){
this.avatarList = avatarList; this.avatarList = avatarList;
} }
/**
* 获取 头像图片地址
* @return avatarNotList
*/
public List<String> getAvatarNotList(){
return this.avatarNotList;
}
/**
* 设置 头像图片地址
* @param avatarNotList
*/
public void setAvatarNotList(List<String> avatarNotList){
this.avatarNotList = avatarNotList;
}
/** /**
* 获取 开始 客户来源 * 获取 开始 客户来源
* @return customerSrcStart * @return customerSrcStart
...@@ -605,6 +872,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -605,6 +872,23 @@ public class CustomerQuery extends CustomerEntity {
this.customerSrcList = customerSrcList; this.customerSrcList = customerSrcList;
} }
/**
* 获取 客户来源
* @return customerSrcNotList
*/
public List<Long> getCustomerSrcNotList(){
return this.customerSrcNotList;
}
/**
* 设置 客户来源
* @param customerSrcNotList
*/
public void setCustomerSrcNotList(List<Long> customerSrcNotList){
this.customerSrcNotList = customerSrcNotList;
}
/** /**
* 获取 开始 使用状态，1:正常，0:禁用，默认：0 * 获取 开始 使用状态，1:正常，0:禁用，默认：0
* @return statusStart * @return statusStart
...@@ -669,6 +953,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -669,6 +953,23 @@ public class CustomerQuery extends CustomerEntity {
this.statusList = statusList; this.statusList = statusList;
} }
/**
* 获取 使用状态，1:正常，0:禁用，默认：0
* @return statusNotList
*/
public List<Integer> getStatusNotList(){
return this.statusNotList;
}
/**
* 设置 使用状态，1:正常，0:禁用，默认：0
* @param statusNotList
*/
public void setStatusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -733,6 +1034,23 @@ public class CustomerQuery extends CustomerEntity { ...@@ -733,6 +1034,23 @@ public class CustomerQuery extends CustomerEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 注册时间 * 获取 开始 注册时间
* @return createTimeStart * @return createTimeStart
...@@ -844,6 +1162,55 @@ public class CustomerQuery extends CustomerEntity { ...@@ -844,6 +1162,55 @@ public class CustomerQuery extends CustomerEntity {
public void setLastLoginAddressList(List<String> lastLoginAddressList){ public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList; this.lastLoginAddressList = lastLoginAddressList;
} }
/**
* 获取 最后一次登录地址
* @return lastLoginAddressNotList
*/
public List<String> getLastLoginAddressNotList(){
return this.lastLoginAddressNotList;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressNotList
*/
public void setLastLoginAddressNotList(List<String> lastLoginAddressNotList){
this.lastLoginAddressNotList = lastLoginAddressNotList;
}
/**
* 获取 微信openid
* @return openIdList
*/
public List<String> getOpenIdList(){
return this.openIdList;
}
/**
* 设置 微信openid
* @param openIdList
*/
public void setOpenIdList(List<String> openIdList){
this.openIdList = openIdList;
}
/**
* 获取 微信openid
* @return openIdNotList
*/
public List<String> getOpenIdNotList(){
return this.openIdNotList;
}
/**
* 设置 微信openid
* @param openIdNotList
*/
public void setOpenIdNotList(List<String> openIdNotList){
this.openIdNotList = openIdNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -889,6 +1256,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -889,6 +1256,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public CustomerQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 用户登录账号 * 设置 用户登录账号
...@@ -972,6 +1348,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -972,6 +1348,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0
* @param memberLevelNotList
*/
public CustomerQuery memberLevelNotList(List<Integer> memberLevelNotList){
this.memberLevelNotList = memberLevelNotList;
return this;
}
/** /**
* 设置 客户真实名称 * 设置 客户真实名称
...@@ -1093,6 +1478,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1093,6 +1478,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 站点ID
* @param siteIdNotList
*/
public CustomerQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/** /**
* 设置 性别 * 设置 性别
* @param sex * @param sex
...@@ -1138,6 +1532,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1138,6 +1532,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 性别
* @param sexNotList
*/
public CustomerQuery sexNotList(List<Integer> sexNotList){
this.sexNotList = sexNotList;
return this;
}
/** /**
* 设置 邮箱 * 设置 邮箱
...@@ -1240,6 +1643,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1240,6 +1643,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 客户来源
* @param customerSrcNotList
*/
public CustomerQuery customerSrcNotList(List<Long> customerSrcNotList){
this.customerSrcNotList = customerSrcNotList;
return this;
}
/** /**
* 设置 使用状态，1:正常，0:禁用，默认：0 * 设置 使用状态，1:正常，0:禁用，默认：0
* @param status * @param status
...@@ -1285,6 +1697,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1285,6 +1697,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 使用状态，1:正常，0:禁用，默认：0
* @param statusNotList
*/
public CustomerQuery statusNotList(List<Integer> statusNotList){
this.statusNotList = statusNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1330,6 +1751,15 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1330,6 +1751,15 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public CustomerQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
...@@ -1352,6 +1782,25 @@ public class CustomerQuery extends CustomerEntity { ...@@ -1352,6 +1782,25 @@ public class CustomerQuery extends CustomerEntity {
return this; return this;
} }
/**
* 设置 微信openid
* @param openId
*/
public CustomerQuery openId(String openId){
setOpenId(openId);
return this;
}
/**
* 设置 微信openid
* @param openIdList
*/
public CustomerQuery openIdList(List<String> openIdList){
this.openIdList = openIdList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerWorkCollectEntity.java
View file @ b516bd52
package com.mortals.xhx.module.customer.model; package com.mortals.xhx.module.customer.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.customer.model.vo.CustomerWorkCollectVo; import com.mortals.xhx.module.customer.model.vo.CustomerWorkCollectVo;
import lombok.Data;
/** /**
* 客户收藏信息实体对象 * 客户收藏信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-13 * @date 2023-07-11
*/ */
@Data
public class CustomerWorkCollectEntity extends CustomerWorkCollectVo { public class CustomerWorkCollectEntity extends CustomerWorkCollectVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -24,42 +24,10 @@ public class CustomerWorkCollectEntity extends CustomerWorkCollectVo { ...@@ -24,42 +24,10 @@ public class CustomerWorkCollectEntity extends CustomerWorkCollectVo {
* 模版ID * 模版ID
*/ */
private Long masterplateId; private Long masterplateId;
public CustomerWorkCollectEntity(){}
/**
* 获取 客户ID
* @return Long
*/
public Long getCustomerId(){
return customerId;
}
/**
* 设置 客户ID
* @param customerId
*/
public void setCustomerId(Long customerId){
this.customerId = customerId;
}
/** /**
* 获取 模版ID * 作品类型：1:图片，2:视频
* @return Long
*/ */
public Long getMasterplateId(){ private Integer designType;
return masterplateId;
}
/**
* 设置 模版ID
* @param masterplateId
*/
public void setMasterplateId(Long masterplateId){
this.masterplateId = masterplateId;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -76,17 +44,12 @@ public class CustomerWorkCollectEntity extends CustomerWorkCollectVo { ...@@ -76,17 +44,12 @@ public class CustomerWorkCollectEntity extends CustomerWorkCollectVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",customerId:").append(getCustomerId());
sb.append(",masterplateId:").append(getMasterplateId());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.customerId = null; this.customerId = null;
this.masterplateId = null; this.masterplateId = -1L;
this.designType = 1;
} }
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerWorkCollectQuery.java
View file @ b516bd52
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.customer.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.customer.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.customer.model.CustomerWorkCollectEntity; import com.mortals.xhx.module.customer.model.CustomerWorkCollectEntity;
/** /**
* 客户收藏信息查询对象 * 客户收藏信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-06-13 * @date 2023-07-11
*/ */
public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -21,6 +21,9 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 客户ID */ /** 开始 客户ID */
private Long customerIdStart; private Long customerIdStart;
...@@ -33,6 +36,9 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -33,6 +36,9 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
/** 客户ID列表 */ /** 客户ID列表 */
private List <Long> customerIdList; private List <Long> customerIdList;
/** 客户ID排除列表 */
private List <Long> customerIdNotList;
/** 开始 模版ID */ /** 开始 模版ID */
private Long masterplateIdStart; private Long masterplateIdStart;
...@@ -45,12 +51,30 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -45,12 +51,30 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
/** 模版ID列表 */ /** 模版ID列表 */
private List <Long> masterplateIdList; private List <Long> masterplateIdList;
/** 模版ID排除列表 */
private List <Long> masterplateIdNotList;
/** 开始 收藏时间 */ /** 开始 收藏时间 */
private String createTimeStart; private String createTimeStart;
/** 结束 收藏时间 */ /** 结束 收藏时间 */
private String createTimeEnd; private String createTimeEnd;
/** 开始 作品类型：1:图片，2:视频 */
private Integer designTypeStart;
/** 结束 作品类型：1:图片，2:视频 */
private Integer designTypeEnd;
/** 增加 作品类型：1:图片，2:视频 */
private Integer designTypeIncrement;
/** 作品类型：1:图片，2:视频列表 */
private List <Integer> designTypeList;
/** 作品类型：1:图片，2:视频排除列表 */
private List <Integer> designTypeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerWorkCollectQuery> orConditionList; private List<CustomerWorkCollectQuery> orConditionList;
...@@ -123,6 +147,23 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -123,6 +147,23 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 客户ID * 获取 开始 客户ID
* @return customerIdStart * @return customerIdStart
...@@ -187,6 +228,23 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -187,6 +228,23 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
this.customerIdList = customerIdList; this.customerIdList = customerIdList;
} }
/**
* 获取 客户ID
* @return customerIdNotList
*/
public List<Long> getCustomerIdNotList(){
return this.customerIdNotList;
}
/**
* 设置 客户ID
* @param customerIdNotList
*/
public void setCustomerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
}
/** /**
* 获取 开始 模版ID * 获取 开始 模版ID
* @return masterplateIdStart * @return masterplateIdStart
...@@ -251,6 +309,23 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -251,6 +309,23 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
this.masterplateIdList = masterplateIdList; this.masterplateIdList = masterplateIdList;
} }
/**
* 获取 模版ID
* @return masterplateIdNotList
*/
public List<Long> getMasterplateIdNotList(){
return this.masterplateIdNotList;
}
/**
* 设置 模版ID
* @param masterplateIdNotList
*/
public void setMasterplateIdNotList(List<Long> masterplateIdNotList){
this.masterplateIdNotList = masterplateIdNotList;
}
/** /**
* 获取 开始 收藏时间 * 获取 开始 收藏时间
* @return createTimeStart * @return createTimeStart
...@@ -283,6 +358,87 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -283,6 +358,87 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/**
* 获取 开始 作品类型：1:图片，2:视频
* @return designTypeStart
*/
public Integer getDesignTypeStart(){
return this.designTypeStart;
}
/**
* 设置 开始 作品类型：1:图片，2:视频
* @param designTypeStart
*/
public void setDesignTypeStart(Integer designTypeStart){
this.designTypeStart = designTypeStart;
}
/**
* 获取 结束 作品类型：1:图片，2:视频
* @return $designTypeEnd
*/
public Integer getDesignTypeEnd(){
return this.designTypeEnd;
}
/**
* 设置 结束 作品类型：1:图片，2:视频
* @param designTypeEnd
*/
public void setDesignTypeEnd(Integer designTypeEnd){
this.designTypeEnd = designTypeEnd;
}
/**
* 获取 增加 作品类型：1:图片，2:视频
* @return designTypeIncrement
*/
public Integer getDesignTypeIncrement(){
return this.designTypeIncrement;
}
/**
* 设置 增加 作品类型：1:图片，2:视频
* @param designTypeIncrement
*/
public void setDesignTypeIncrement(Integer designTypeIncrement){
this.designTypeIncrement = designTypeIncrement;
}
/**
* 获取 作品类型：1:图片，2:视频
* @return designTypeList
*/
public List<Integer> getDesignTypeList(){
return this.designTypeList;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeList
*/
public void setDesignTypeList(List<Integer> designTypeList){
this.designTypeList = designTypeList;
}
/**
* 获取 作品类型：1:图片，2:视频
* @return designTypeNotList
*/
public List<Integer> getDesignTypeNotList(){
return this.designTypeNotList;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeNotList
*/
public void setDesignTypeNotList(List<Integer> designTypeNotList){
this.designTypeNotList = designTypeNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -328,6 +484,15 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -328,6 +484,15 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public CustomerWorkCollectQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 客户ID * 设置 客户ID
* @param customerId * @param customerId
...@@ -373,6 +538,15 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -373,6 +538,15 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
return this; return this;
} }
/**
* 设置 客户ID
* @param customerIdNotList
*/
public CustomerWorkCollectQuery customerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
return this;
}
/** /**
* 设置 模版ID * 设置 模版ID
* @param masterplateId * @param masterplateId
...@@ -418,6 +592,69 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity { ...@@ -418,6 +592,69 @@ public class CustomerWorkCollectQuery extends CustomerWorkCollectEntity {
return this; return this;
} }
/**
* 设置 模版ID
* @param masterplateIdNotList
*/
public CustomerWorkCollectQuery masterplateIdNotList(List<Long> masterplateIdNotList){
this.masterplateIdNotList = masterplateIdNotList;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designType
*/
public CustomerWorkCollectQuery designType(Integer designType){
setDesignType(designType);
return this;
}
/**
* 设置 开始 作品类型：1:图片，2:视频
* @param designTypeStart
*/
public CustomerWorkCollectQuery designTypeStart(Integer designTypeStart){
this.designTypeStart = designTypeStart;
return this;
}
/**
* 设置 结束 作品类型：1:图片，2:视频
* @param designTypeEnd
*/
public CustomerWorkCollectQuery designTypeEnd(Integer designTypeEnd){
this.designTypeEnd = designTypeEnd;
return this;
}
/**
* 设置 增加 作品类型：1:图片，2:视频
* @param designTypeIncrement
*/
public CustomerWorkCollectQuery designTypeIncrement(Integer designTypeIncrement){
this.designTypeIncrement = designTypeIncrement;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeList
*/
public CustomerWorkCollectQuery designTypeList(List<Integer> designTypeList){
this.designTypeList = designTypeList;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeNotList
*/
public CustomerWorkCollectQuery designTypeNotList(List<Integer> designTypeNotList){
this.designTypeNotList = designTypeNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerWorkDesignEntity.java
View file @ b516bd52
package com.mortals.xhx.module.customer.model; package com.mortals.xhx.module.customer.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.customer.model.vo.CustomerWorkDesignVo; import com.mortals.xhx.module.customer.model.vo.CustomerWorkDesignVo;
import lombok.Data;
/** /**
* 客户作品信息实体对象 * 客户作品信息实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-08 * @date 2023-07-11
*/ */
@Data
public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -56,154 +56,10 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -56,154 +56,10 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
* 设计草稿 * 设计草稿
*/ */
private String draft; private String draft;
public CustomerWorkDesignEntity(){}
/**
* 获取 客户ID
* @return Long
*/
public Long getCustomerId(){
return customerId;
}
/**
* 设置 客户ID
* @param customerId
*/
public void setCustomerId(Long customerId){
this.customerId = customerId;
}
/**
* 获取 作品名称
* @return String
*/
public String getWorkDesignName(){
return workDesignName;
}
/**
* 设置 作品名称
* @param workDesignName
*/
public void setWorkDesignName(String workDesignName){
this.workDesignName = workDesignName;
}
/**
* 获取 作品状态：0:草稿，1:发布
* @return Integer
*/
public Integer getWorkDesignStatus(){
return workDesignStatus;
}
/**
* 设置 作品状态：0:草稿，1:发布
* @param workDesignStatus
*/
public void setWorkDesignStatus(Integer workDesignStatus){
this.workDesignStatus = workDesignStatus;
}
/**
* 获取 作品描述
* @return String
*/
public String getWorkDesignDesc(){
return workDesignDesc;
}
/**
* 设置 作品描述
* @param workDesignDesc
*/
public void setWorkDesignDesc(String workDesignDesc){
this.workDesignDesc = workDesignDesc;
}
/**
* 获取 模版引用的图片
* @return String
*/
public String getPictureIds(){
return pictureIds;
}
/**
* 设置 模版引用的图片
* @param pictureIds
*/
public void setPictureIds(String pictureIds){
this.pictureIds = pictureIds;
}
/** /**
* 获取 模版引用的素材 * 作品类型：1:图片，2:视频
* @return String
*/ */
public String getPictureSrcIds(){ private Integer designType;
return pictureSrcIds;
}
/**
* 设置 模版引用的素材
* @param pictureSrcIds
*/
public void setPictureSrcIds(String pictureSrcIds){
this.pictureSrcIds = pictureSrcIds;
}
/**
* 获取 模版引用的背景
* @return String
*/
public String getPictureBackgroundIds(){
return pictureBackgroundIds;
}
/**
* 设置 模版引用的背景
* @param pictureBackgroundIds
*/
public void setPictureBackgroundIds(String pictureBackgroundIds){
this.pictureBackgroundIds = pictureBackgroundIds;
}
/**
* 获取 作品引用的字体
* @return String
*/
public String getFontIds(){
return fontIds;
}
/**
* 设置 作品引用的字体
* @param fontIds
*/
public void setFontIds(String fontIds){
this.fontIds = fontIds;
}
/**
* 获取 作品图片预览地址（相对地址）
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 设计草稿
* @return String
*/
public String getDraft(){
return draft;
}
/**
* 设置 设计草稿
* @param draft
*/
public void setDraft(String draft){
this.draft = draft;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -220,28 +76,13 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -220,28 +76,13 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",customerId:").append(getCustomerId());
sb.append(",workDesignName:").append(getWorkDesignName());
sb.append(",workDesignStatus:").append(getWorkDesignStatus());
sb.append(",workDesignDesc:").append(getWorkDesignDesc());
sb.append(",pictureIds:").append(getPictureIds());
sb.append(",pictureSrcIds:").append(getPictureSrcIds());
sb.append(",pictureBackgroundIds:").append(getPictureBackgroundIds());
sb.append(",fontIds:").append(getFontIds());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",draft:").append(getDraft());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.customerId = null; this.customerId = null;
this.workDesignName = ""; this.workDesignName = "";
this.workDesignStatus = null; this.workDesignStatus = -1;
this.workDesignDesc = ""; this.workDesignDesc = "";
...@@ -256,5 +97,7 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo { ...@@ -256,5 +97,7 @@ public class CustomerWorkDesignEntity extends CustomerWorkDesignVo {
this.previewUrl = ""; this.previewUrl = "";
this.draft = ""; this.draft = "";
this.designType = 1;
} }
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/CustomerWorkDesignQuery.java
View file @ b516bd52
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity;
* 客户作品信息查询对象 * 客户作品信息查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-08 * @date 2023-07-11
*/ */
public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -21,6 +21,9 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -21,6 +21,9 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 客户ID */ /** 开始 客户ID */
private Long customerIdStart; private Long customerIdStart;
...@@ -33,9 +36,14 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -33,9 +36,14 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 客户ID列表 */ /** 客户ID列表 */
private List <Long> customerIdList; private List <Long> customerIdList;
/** 客户ID排除列表 */
private List <Long> customerIdNotList;
/** 作品名称 */ /** 作品名称 */
private List<String> workDesignNameList; private List<String> workDesignNameList;
/** 作品名称排除列表 */
private List <String> workDesignNameNotList;
/** 开始 作品状态：0:草稿，1:发布 */ /** 开始 作品状态：0:草稿，1:发布 */
private Integer workDesignStatusStart; private Integer workDesignStatusStart;
...@@ -48,9 +56,14 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -48,9 +56,14 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 作品状态：0:草稿，1:发布列表 */ /** 作品状态：0:草稿，1:发布列表 */
private List <Integer> workDesignStatusList; private List <Integer> workDesignStatusList;
/** 作品状态：0:草稿，1:发布排除列表 */
private List <Integer> workDesignStatusNotList;
/** 作品描述 */ /** 作品描述 */
private List<String> workDesignDescList; private List<String> workDesignDescList;
/** 作品描述排除列表 */
private List <String> workDesignDescNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -66,21 +79,48 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -66,21 +79,48 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
/** 模版引用的图片 */ /** 模版引用的图片 */
private List<String> pictureIdsList; private List<String> pictureIdsList;
/** 模版引用的图片排除列表 */
private List <String> pictureIdsNotList;
/** 模版引用的素材 */ /** 模版引用的素材 */
private List<String> pictureSrcIdsList; private List<String> pictureSrcIdsList;
/** 模版引用的素材排除列表 */
private List <String> pictureSrcIdsNotList;
/** 模版引用的背景 */ /** 模版引用的背景 */
private List<String> pictureBackgroundIdsList; private List<String> pictureBackgroundIdsList;
/** 模版引用的背景排除列表 */
private List <String> pictureBackgroundIdsNotList;
/** 作品引用的字体 */ /** 作品引用的字体 */
private List<String> fontIdsList; private List<String> fontIdsList;
/** 作品引用的字体排除列表 */
private List <String> fontIdsNotList;
/** 作品图片预览地址（相对地址） */ /** 作品图片预览地址（相对地址） */
private List<String> previewUrlList; private List<String> previewUrlList;
/** 作品图片预览地址（相对地址）排除列表 */
private List <String> previewUrlNotList;
/** 设计草稿 */ /** 设计草稿 */
private List<String> draftList; private List<String> draftList;
/** 设计草稿排除列表 */
private List <String> draftNotList;
/** 开始 作品类型：1:图片，2:视频 */
private Integer designTypeStart;
/** 结束 作品类型：1:图片，2:视频 */
private Integer designTypeEnd;
/** 增加 作品类型：1:图片，2:视频 */
private Integer designTypeIncrement;
/** 作品类型：1:图片，2:视频列表 */
private List <Integer> designTypeList;
/** 作品类型：1:图片，2:视频排除列表 */
private List <Integer> designTypeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<CustomerWorkDesignQuery> orConditionList; private List<CustomerWorkDesignQuery> orConditionList;
...@@ -153,6 +193,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -153,6 +193,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 客户ID * 获取 开始 客户ID
* @return customerIdStart * @return customerIdStart
...@@ -217,6 +274,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -217,6 +274,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
this.customerIdList = customerIdList; this.customerIdList = customerIdList;
} }
/**
* 获取 客户ID
* @return customerIdNotList
*/
public List<Long> getCustomerIdNotList(){
return this.customerIdNotList;
}
/**
* 设置 客户ID
* @param customerIdNotList
*/
public void setCustomerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
}
/** /**
* 获取 作品名称 * 获取 作品名称
* @return workDesignNameList * @return workDesignNameList
...@@ -232,6 +306,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -232,6 +306,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setWorkDesignNameList(List<String> workDesignNameList){ public void setWorkDesignNameList(List<String> workDesignNameList){
this.workDesignNameList = workDesignNameList; this.workDesignNameList = workDesignNameList;
} }
/**
* 获取 作品名称
* @return workDesignNameNotList
*/
public List<String> getWorkDesignNameNotList(){
return this.workDesignNameNotList;
}
/**
* 设置 作品名称
* @param workDesignNameNotList
*/
public void setWorkDesignNameNotList(List<String> workDesignNameNotList){
this.workDesignNameNotList = workDesignNameNotList;
}
/** /**
* 获取 开始 作品状态：0:草稿，1:发布 * 获取 开始 作品状态：0:草稿，1:发布
* @return workDesignStatusStart * @return workDesignStatusStart
...@@ -296,6 +387,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -296,6 +387,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
this.workDesignStatusList = workDesignStatusList; this.workDesignStatusList = workDesignStatusList;
} }
/**
* 获取 作品状态：0:草稿，1:发布
* @return workDesignStatusNotList
*/
public List<Integer> getWorkDesignStatusNotList(){
return this.workDesignStatusNotList;
}
/**
* 设置 作品状态：0:草稿，1:发布
* @param workDesignStatusNotList
*/
public void setWorkDesignStatusNotList(List<Integer> workDesignStatusNotList){
this.workDesignStatusNotList = workDesignStatusNotList;
}
/** /**
* 获取 作品描述 * 获取 作品描述
* @return workDesignDescList * @return workDesignDescList
...@@ -311,6 +419,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -311,6 +419,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setWorkDesignDescList(List<String> workDesignDescList){ public void setWorkDesignDescList(List<String> workDesignDescList){
this.workDesignDescList = workDesignDescList; this.workDesignDescList = workDesignDescList;
} }
/**
* 获取 作品描述
* @return workDesignDescNotList
*/
public List<String> getWorkDesignDescNotList(){
return this.workDesignDescNotList;
}
/**
* 设置 作品描述
* @param workDesignDescNotList
*/
public void setWorkDesignDescNotList(List<String> workDesignDescNotList){
this.workDesignDescNotList = workDesignDescNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -390,6 +515,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -390,6 +515,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setPictureIdsList(List<String> pictureIdsList){ public void setPictureIdsList(List<String> pictureIdsList){
this.pictureIdsList = pictureIdsList; this.pictureIdsList = pictureIdsList;
} }
/**
* 获取 模版引用的图片
* @return pictureIdsNotList
*/
public List<String> getPictureIdsNotList(){
return this.pictureIdsNotList;
}
/**
* 设置 模版引用的图片
* @param pictureIdsNotList
*/
public void setPictureIdsNotList(List<String> pictureIdsNotList){
this.pictureIdsNotList = pictureIdsNotList;
}
/** /**
* 获取 模版引用的素材 * 获取 模版引用的素材
* @return pictureSrcIdsList * @return pictureSrcIdsList
...@@ -405,6 +547,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -405,6 +547,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setPictureSrcIdsList(List<String> pictureSrcIdsList){ public void setPictureSrcIdsList(List<String> pictureSrcIdsList){
this.pictureSrcIdsList = pictureSrcIdsList; this.pictureSrcIdsList = pictureSrcIdsList;
} }
/**
* 获取 模版引用的素材
* @return pictureSrcIdsNotList
*/
public List<String> getPictureSrcIdsNotList(){
return this.pictureSrcIdsNotList;
}
/**
* 设置 模版引用的素材
* @param pictureSrcIdsNotList
*/
public void setPictureSrcIdsNotList(List<String> pictureSrcIdsNotList){
this.pictureSrcIdsNotList = pictureSrcIdsNotList;
}
/** /**
* 获取 模版引用的背景 * 获取 模版引用的背景
* @return pictureBackgroundIdsList * @return pictureBackgroundIdsList
...@@ -420,6 +579,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -420,6 +579,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setPictureBackgroundIdsList(List<String> pictureBackgroundIdsList){ public void setPictureBackgroundIdsList(List<String> pictureBackgroundIdsList){
this.pictureBackgroundIdsList = pictureBackgroundIdsList; this.pictureBackgroundIdsList = pictureBackgroundIdsList;
} }
/**
* 获取 模版引用的背景
* @return pictureBackgroundIdsNotList
*/
public List<String> getPictureBackgroundIdsNotList(){
return this.pictureBackgroundIdsNotList;
}
/**
* 设置 模版引用的背景
* @param pictureBackgroundIdsNotList
*/
public void setPictureBackgroundIdsNotList(List<String> pictureBackgroundIdsNotList){
this.pictureBackgroundIdsNotList = pictureBackgroundIdsNotList;
}
/** /**
* 获取 作品引用的字体 * 获取 作品引用的字体
* @return fontIdsList * @return fontIdsList
...@@ -435,6 +611,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -435,6 +611,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setFontIdsList(List<String> fontIdsList){ public void setFontIdsList(List<String> fontIdsList){
this.fontIdsList = fontIdsList; this.fontIdsList = fontIdsList;
} }
/**
* 获取 作品引用的字体
* @return fontIdsNotList
*/
public List<String> getFontIdsNotList(){
return this.fontIdsNotList;
}
/**
* 设置 作品引用的字体
* @param fontIdsNotList
*/
public void setFontIdsNotList(List<String> fontIdsNotList){
this.fontIdsNotList = fontIdsNotList;
}
/** /**
* 获取 作品图片预览地址（相对地址） * 获取 作品图片预览地址（相对地址）
* @return previewUrlList * @return previewUrlList
...@@ -450,6 +643,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -450,6 +643,23 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setPreviewUrlList(List<String> previewUrlList){ public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList; this.previewUrlList = previewUrlList;
} }
/**
* 获取 作品图片预览地址（相对地址）
* @return previewUrlNotList
*/
public List<String> getPreviewUrlNotList(){
return this.previewUrlNotList;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrlNotList
*/
public void setPreviewUrlNotList(List<String> previewUrlNotList){
this.previewUrlNotList = previewUrlNotList;
}
/** /**
* 获取 设计草稿 * 获取 设计草稿
* @return draftList * @return draftList
...@@ -465,6 +675,104 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -465,6 +675,104 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
public void setDraftList(List<String> draftList){ public void setDraftList(List<String> draftList){
this.draftList = draftList; this.draftList = draftList;
} }
/**
* 获取 设计草稿
* @return draftNotList
*/
public List<String> getDraftNotList(){
return this.draftNotList;
}
/**
* 设置 设计草稿
* @param draftNotList
*/
public void setDraftNotList(List<String> draftNotList){
this.draftNotList = draftNotList;
}
/**
* 获取 开始 作品类型：1:图片，2:视频
* @return designTypeStart
*/
public Integer getDesignTypeStart(){
return this.designTypeStart;
}
/**
* 设置 开始 作品类型：1:图片，2:视频
* @param designTypeStart
*/
public void setDesignTypeStart(Integer designTypeStart){
this.designTypeStart = designTypeStart;
}
/**
* 获取 结束 作品类型：1:图片，2:视频
* @return $designTypeEnd
*/
public Integer getDesignTypeEnd(){
return this.designTypeEnd;
}
/**
* 设置 结束 作品类型：1:图片，2:视频
* @param designTypeEnd
*/
public void setDesignTypeEnd(Integer designTypeEnd){
this.designTypeEnd = designTypeEnd;
}
/**
* 获取 增加 作品类型：1:图片，2:视频
* @return designTypeIncrement
*/
public Integer getDesignTypeIncrement(){
return this.designTypeIncrement;
}
/**
* 设置 增加 作品类型：1:图片，2:视频
* @param designTypeIncrement
*/
public void setDesignTypeIncrement(Integer designTypeIncrement){
this.designTypeIncrement = designTypeIncrement;
}
/**
* 获取 作品类型：1:图片，2:视频
* @return designTypeList
*/
public List<Integer> getDesignTypeList(){
return this.designTypeList;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeList
*/
public void setDesignTypeList(List<Integer> designTypeList){
this.designTypeList = designTypeList;
}
/**
* 获取 作品类型：1:图片，2:视频
* @return designTypeNotList
*/
public List<Integer> getDesignTypeNotList(){
return this.designTypeNotList;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeNotList
*/
public void setDesignTypeNotList(List<Integer> designTypeNotList){
this.designTypeNotList = designTypeNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -510,6 +818,15 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -510,6 +818,15 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public CustomerWorkDesignQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 客户ID * 设置 客户ID
* @param customerId * @param customerId
...@@ -555,6 +872,15 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -555,6 +872,15 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
return this; return this;
} }
/**
* 设置 客户ID
* @param customerIdNotList
*/
public CustomerWorkDesignQuery customerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
return this;
}
/** /**
* 设置 作品名称 * 设置 作品名称
...@@ -619,6 +945,15 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -619,6 +945,15 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
return this; return this;
} }
/**
* 设置 作品状态：0:草稿，1:发布
* @param workDesignStatusNotList
*/
public CustomerWorkDesignQuery workDesignStatusNotList(List<Integer> workDesignStatusNotList){
this.workDesignStatusNotList = workDesignStatusNotList;
return this;
}
/** /**
* 设置 作品描述 * 设置 作品描述
...@@ -754,6 +1089,60 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity { ...@@ -754,6 +1089,60 @@ public class CustomerWorkDesignQuery extends CustomerWorkDesignEntity {
return this; return this;
} }
/**
* 设置 作品类型：1:图片，2:视频
* @param designType
*/
public CustomerWorkDesignQuery designType(Integer designType){
setDesignType(designType);
return this;
}
/**
* 设置 开始 作品类型：1:图片，2:视频
* @param designTypeStart
*/
public CustomerWorkDesignQuery designTypeStart(Integer designTypeStart){
this.designTypeStart = designTypeStart;
return this;
}
/**
* 设置 结束 作品类型：1:图片，2:视频
* @param designTypeEnd
*/
public CustomerWorkDesignQuery designTypeEnd(Integer designTypeEnd){
this.designTypeEnd = designTypeEnd;
return this;
}
/**
* 设置 增加 作品类型：1:图片，2:视频
* @param designTypeIncrement
*/
public CustomerWorkDesignQuery designTypeIncrement(Integer designTypeIncrement){
this.designTypeIncrement = designTypeIncrement;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeList
*/
public CustomerWorkDesignQuery designTypeList(List<Integer> designTypeList){
this.designTypeList = designTypeList;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeNotList
*/
public CustomerWorkDesignQuery designTypeNotList(List<Integer> designTypeNotList){
this.designTypeNotList = designTypeNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/vo/CustomerCensusVo.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.model.vo;
import lombok.Data;
/**
* 用户分类统计
*/
@Data
public class CustomerCensusVo {
/**
* 会员等级，，0：未开启，1：试用客户，2：VIP，3：设计师，默认0
*/
private Integer memberLevel;
/** 统计结果 **/
private Integer customerCount;
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/vo/CustomerDesignCensusVo.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.model.vo;
import lombok.Data;
/**
* 用户作品统计
*/
@Data
public class CustomerDesignCensusVo {
/** 图片数 **/
private Integer picturesCount;
/** 视频数 **/
private Integer videosCount;
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/vo/CustomerPwdRecordVo.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.customer.model.vo;
import com.mortals.framework.model.BaseEntityLong;
public class CustomerPwdRecordVo extends BaseEntityLong {
}
datav-manager/src/main/java/com/mortals/xhx/module/customer/model/vo/CustomerVo.java
View file @ b516bd52
package com.mortals.xhx.module.customer.model.vo; package com.mortals.xhx.module.customer.model.vo;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* 客户管理视图对象 * 客户管理视图对象
...@@ -38,4 +40,27 @@ public class CustomerVo extends BaseEntityLong { ...@@ -38,4 +40,27 @@ public class CustomerVo extends BaseEntityLong {
private String oldPassword; private String oldPassword;
private String newPassword; private String newPassword;
/**
* 客户设计图片数量
*/
@Excel(name = "图片作品数")
private Integer customerDesignPictures;
/**
* 客户设计视频数量
*/
@Excel(name = "视频作品数")
private Integer customerDesignVideos;
@Excel(name = "会员等级")
private String levelName;
@Excel(name = "使用状态")
private String statusName;
/**
* 最后一次登录时间
*/
@Excel(name = "最近登录时间")
private String lastLoginTimeStr;
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/customer/service/CustomerService.java
View file @ b516bd52
...@@ -8,6 +8,8 @@ import com.mortals.framework.service.ICRUDService; ...@@ -8,6 +8,8 @@ import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerEntityExt; import com.mortals.xhx.module.customer.model.CustomerEntityExt;
import java.util.Map;
/** /**
* CustomerService * CustomerService
* *
...@@ -57,4 +59,36 @@ public interface CustomerService extends ICRUDService<CustomerEntity,Long>{ ...@@ -57,4 +59,36 @@ public interface CustomerService extends ICRUDService<CustomerEntity,Long>{
* @throws AppException * @throws AppException
*/ */
void changePasswordByAdmin(CustomerEntity params, Context context) throws AppException; void changePasswordByAdmin(CustomerEntity params, Context context) throws AppException;
/**
* 用户情况统计
* @return
*/
Map<String,Object> getCustomerCensus();
/**
* 发送手机验证码
* @param mobileNumber
* @throws AppException
*/
void sendSmsVerifyCode(String mobileNumber) throws AppException;
/**
* 手机验证码登录
* @param mobileNumber
* @param verifyCode
* @param loginIp
* @return
* @throws AppException
*/
CustomerEntity doSmsLogin(String mobileNumber, String verifyCode, String loginIp) throws AppException;
/**
* 微信扫码登录
* @param openId
* @param loginIp
* @return
* @throws AppException
*/
CustomerEntity doWeChatLogin(String openId, String loginIp) throws AppException;
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerServiceImpl.java
View file @ b516bd52
package com.mortals.xhx.module.customer.service.impl; package com.mortals.xhx.module.customer.service.impl;
import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.core.util.PhoneUtil; import cn.hutool.core.util.PhoneUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.*;
import com.mortals.framework.util.SecurityUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.common.code.CustomerSatusEnum; import com.mortals.xhx.common.code.CustomerSatusEnum;
import com.mortals.xhx.common.code.UserStatus;
import com.mortals.xhx.module.customer.dao.CustomerDao; import com.mortals.xhx.module.customer.dao.CustomerDao;
import com.mortals.xhx.module.customer.dao.CustomerPwdRecordDao;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerEntityExt; import com.mortals.xhx.module.customer.model.CustomerEntityExt;
import com.mortals.xhx.module.customer.model.CustomerPwdRecordEntity;
import com.mortals.xhx.module.customer.model.CustomerQuery; import com.mortals.xhx.module.customer.model.CustomerQuery;
import com.mortals.xhx.module.customer.model.vo.CustomerCensusVo;
import com.mortals.xhx.module.customer.model.vo.CustomerDesignCensusVo;
import com.mortals.xhx.module.customer.service.CustomerService; import com.mortals.xhx.module.customer.service.CustomerService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
/** /**
* CustomerService * CustomerService
...@@ -34,6 +39,21 @@ import java.util.List; ...@@ -34,6 +39,21 @@ import java.util.List;
@Service("customerService") @Service("customerService")
public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, CustomerEntity, Long> implements CustomerService { public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, CustomerEntity, Long> implements CustomerService {
@Value("${sms.apiUrl:http://sms.wx3.com.cn/api/index/index}")
private String smsApiUrl;
@Value("${sms.appid:ADsUXLrS81vZDU95}")
private String appid;
/** 短信模板ID**/
private static String SMS_TPYE = "30";
private static String SMS_VERIFY_CODE_KEY ="login:sms:verify:";
@Autowired
private ICacheService cacheService;
@Autowired
private CustomerPwdRecordDao customerPwdRecordDao;
@Override @Override
protected void saveBefore(CustomerEntity entity, Context context) throws AppException { protected void saveBefore(CustomerEntity entity, Context context) throws AppException {
this.validData(entity, context); this.validData(entity, context);
...@@ -54,7 +74,11 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -54,7 +74,11 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
} }
if (StringUtils.isNotEmpty(entity.getPassword())) { if (StringUtils.isNotEmpty(entity.getPassword())) {
try { try {
entity.setPassword(SecurityUtil.md5DoubleEncoding(entity.getPassword())); String saltKey = SecurityCode.getSecurityCode(6,SecurityCode.SecurityCodeLevel.Medium,false);
String newPwd = entity.getPassword() + saltKey;
newPwd = SecurityUtil.md5DoubleEncoding(newPwd);
entity.setPassword(newPwd);
entity.setSaltKey(saltKey);
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码转换异常"); throw new AppException("密码转换异常");
} }
...@@ -93,6 +117,8 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -93,6 +117,8 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
list.stream().forEach(item->{ list.stream().forEach(item->{
item.setCreateTimeStr(DateUtils.getDateTime(item.getCreateTime(),DateUtils.P_yyyy_MM_dd_HH_mm_ss)); item.setCreateTimeStr(DateUtils.getDateTime(item.getCreateTime(),DateUtils.P_yyyy_MM_dd_HH_mm_ss));
item.setContactTelphone(DesensitizedUtil.mobilePhone(item.getContactTelphone()));
item.setCustName(DesensitizedUtil.chineseName(item.getCustName()));
}); });
} }
return result; return result;
...@@ -107,9 +133,41 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -107,9 +133,41 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
if(user.getStatus()!= CustomerSatusEnum.NORMAL.getValue()){ if(user.getStatus()!= CustomerSatusEnum.NORMAL.getValue()){
throw new AppException("该账号已被禁用！"); throw new AppException("该账号已被禁用！");
} }
if(user.getErrorCount()==null){
user.setErrorCount(0);
}
if(user.getLoginLock()==null){
user.setLoginLock(0);
}
if(user.getLoginLock() == 1 && user.getLockTime()!=null){
String nowStr = DateUtils.getCurrStrDate();
String loginDateStr = DateUtils.getDateTime(user.getLockTime(),"yyyy-MM-dd");
if(nowStr.equals(loginDateStr)) {
throw new AppException("此账号当天密码错误次数已达上限，已被锁定");
}
}
try { try {
if(StringUtils.isNotEmpty(user.getSaltKey())) {
password += user.getSaltKey();
}
if (!user.getPassword().equals(SecurityUtil.md5DoubleEncoding(password))) { if (!user.getPassword().equals(SecurityUtil.md5DoubleEncoding(password))) {
CustomerEntity update = new CustomerEntity();
update.setId(user.getId());
update.setErrorCount(user.getErrorCount()+1);
if(update.getErrorCount()==5){
update.setLoginLock(1);
update.setLockTime(new Date());
}
this.dao.update(update);
throw new AppException("登录密码错误！"); throw new AppException("登录密码错误！");
}else {
if(user.getLastUpdatePwdTime()!=null) {
long day = DateUtils.getBetween(user.getLastUpdatePwdTime(), new Date(), 2);
if (day >= 90) {
throw new AppException("密码已超过三个月没有更改，请修改以后再登录");
}
}
} }
} catch (Exception e) { } catch (Exception e) {
throw new AppException("密码验认出错！", e); throw new AppException("密码验认出错！", e);
...@@ -130,6 +188,16 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -130,6 +188,16 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
@Override @Override
public CustomerEntity updateByPersonal(CustomerEntity params, Context context) throws AppException { public CustomerEntity updateByPersonal(CustomerEntity params, Context context) throws AppException {
CustomerEntity old = this.get(params.getId());
if(old==null){
throw new AppException("用户Id不正确！");
}
if(!old.getLoginName().equals(params.getLoginName())) {
CustomerEntity user = this.findByLoginName(params.getLoginName());
if (user != null) {
throw new AppException("用户名已存在！");
}
}
CustomerEntity update = new CustomerEntity(); CustomerEntity update = new CustomerEntity();
update.setId(params.getId()); update.setId(params.getId());
update.setLoginName(params.getLoginName()); update.setLoginName(params.getLoginName());
...@@ -140,6 +208,7 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -140,6 +208,7 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
update.setContactTelphone(params.getContactTelphone()); update.setContactTelphone(params.getContactTelphone());
update.setMailbox(params.getMailbox()); update.setMailbox(params.getMailbox());
update.setJob(params.getJob()); update.setJob(params.getJob());
update.setOpenId(params.getOpenId());
int iRet = this.dao.update(update); int iRet = this.dao.update(update);
if (iRet == 0) { if (iRet == 0) {
throw new AppException(-1002, "更新失败！"); throw new AppException(-1002, "更新失败！");
...@@ -163,9 +232,17 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -163,9 +232,17 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
} }
String newPwd = ""; String newPwd = "";
String oldPwd = ""; String oldPwd = "";
String saltKey = "";
try { try {
oldPwd = SecurityUtil.md5DoubleEncoding(params.getOldPassword()); if(StringUtils.isNotEmpty(old.getSaltKey())) {
newPwd = SecurityUtil.md5DoubleEncoding(params.getNewPassword()); oldPwd = params.getOldPassword()+old.getSaltKey();
}else {
oldPwd = params.getOldPassword();
}
oldPwd = SecurityUtil.md5DoubleEncoding(oldPwd);
saltKey = SecurityCode.getSecurityCode(6,SecurityCode.SecurityCodeLevel.Medium,false);
newPwd = params.getNewPassword() + saltKey;
newPwd = SecurityUtil.md5DoubleEncoding(newPwd);
}catch (Exception e) { }catch (Exception e) {
throw new AppException("密码转换异常"); throw new AppException("密码转换异常");
} }
...@@ -173,8 +250,16 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -173,8 +250,16 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
CustomerEntity update = new CustomerEntity(); CustomerEntity update = new CustomerEntity();
update.setId(params.getId()); update.setId(params.getId());
update.setPassword(newPwd); update.setPassword(newPwd);
update.setSaltKey(saltKey);
this.update(update,context); this.update(update,context);
old.setPassword(null); old.setPassword(null);
CustomerPwdRecordEntity userPwdRecordEntity = new CustomerPwdRecordEntity();
userPwdRecordEntity.setUserId(old.getId());
userPwdRecordEntity.setLoginName(old.getLoginName());
userPwdRecordEntity.setLoginPwd(newPwd);
userPwdRecordEntity.setCreateTime(new Date());
userPwdRecordEntity.setCreateUserId(context.getUser().getId());
customerPwdRecordDao.insert(userPwdRecordEntity);
}else { }else {
throw new AppException("原来的密码不正确"); throw new AppException("原来的密码不正确");
} }
...@@ -188,15 +273,162 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu ...@@ -188,15 +273,162 @@ public class CustomerServiceImpl extends AbstractCRUDServiceImpl<CustomerDao, Cu
throw new AppException("客户信息不存在"); throw new AppException("客户信息不存在");
} }
String newPwd = ""; String newPwd = "";
String oldPwd = ""; String saltKey = "";
try { try {
newPwd = SecurityUtil.md5DoubleEncoding(params.getNewPassword()); saltKey = SecurityCode.getSecurityCode(6,SecurityCode.SecurityCodeLevel.Medium,false);
newPwd = params.getNewPassword() + saltKey;
newPwd = SecurityUtil.md5DoubleEncoding(newPwd);
}catch (Exception e) { }catch (Exception e) {
throw new AppException("密码转换异常"); throw new AppException("密码转换异常");
} }
CustomerEntity update = new CustomerEntity(); CustomerEntity update = new CustomerEntity();
update.setId(params.getId()); update.setId(params.getId());
update.setPassword(newPwd); update.setPassword(newPwd);
update.setSaltKey(saltKey);
this.update(update,context); this.update(update,context);
CustomerPwdRecordEntity userPwdRecordEntity = new CustomerPwdRecordEntity();
userPwdRecordEntity.setUserId(old.getId());
userPwdRecordEntity.setLoginName(old.getLoginName());
userPwdRecordEntity.setLoginPwd(newPwd);
userPwdRecordEntity.setCreateTime(new Date());
userPwdRecordEntity.setCreateUserId(context.getUser().getId());
customerPwdRecordDao.insert(userPwdRecordEntity);
}
@Override
public Map<String, Object> getCustomerCensus() {
Map<String, Object> result = new HashMap<>();
List<CustomerCensusVo> customerCensusVos = dao.getCensus();
CustomerDesignCensusVo designCensusVo = dao.getDesignCensus();
if(CollectionUtils.isNotEmpty(customerCensusVos)){
for(CustomerCensusVo item:customerCensusVos){
if(item.getMemberLevel()==1){
result.put("trial",item.getCustomerCount());
}
if(item.getMemberLevel()==2){
result.put("vip",item.getCustomerCount());
}
if(item.getMemberLevel()==3){
result.put("designer",item.getCustomerCount());
}
}
}
result.put("picturesCount",designCensusVo.getPicturesCount());
result.put("videosCount",designCensusVo.getVideosCount());
return result;
}
@Override
public void sendSmsVerifyCode(String mobileNumber) throws AppException {
if(StringUtils.isEmpty(mobileNumber)){
throw new AppException("手机号不能为空");
}
if(!PhoneUtil.isPhone(mobileNumber)){
throw new AppException("手机号码格式不正确");
}
CustomerEntity customer = this.selectOne(new CustomerQuery().contactTelphone(mobileNumber));
if(customer==null){
throw new AppException("手机号码:" + mobileNumber + "没有注册用户");
}
String verifyCode = cacheService.get(SMS_VERIFY_CODE_KEY + mobileNumber);
if(StringUtils.isNotEmpty(verifyCode)){
throw new AppException("当前手机号码已发送验证码，请稍后重试");
}
try {
Map<String, String> params = new HashMap<>();
params.put("appid",appid);
params.put("phone",mobileNumber);
params.put("type",SMS_TPYE);
String[] json = new String[2];
String vCode = RandomUtil.randomNumbers(6);
json[0] = vCode;
json[1] = "1";
params.put("json",JSONObject.toJSON(json).toString());
String resp = HttpUtil.doPost(smsApiUrl,params);
JSONObject respJson = JSONObject.parseObject(resp);
if(respJson.getIntValue("code")==0){
throw new AppException("短信发送失败:" + respJson.getString("message"));
}
//有效期60秒
cacheService.setnx(SMS_VERIFY_CODE_KEY+mobileNumber,vCode,60);
}catch (Exception e){
log.error("短信发送异常",e);
throw new AppException("短信发送异常");
}
}
@Override
public CustomerEntity doSmsLogin(String mobileNumber, String verifyCode, String loginIp) throws AppException {
if(StringUtils.isEmpty(mobileNumber)){
throw new AppException("手机号不能为空");
}
if(StringUtils.isEmpty(verifyCode)){
throw new AppException("验证码不能为空");
}
if(!PhoneUtil.isPhone(mobileNumber)){
throw new AppException("手机号码格式不正确");
}
CustomerEntity customer = this.selectOne(new CustomerQuery().contactTelphone(mobileNumber));
if(customer==null){
throw new AppException("手机号码:" + mobileNumber + "没有注册用户");
}
String vCode = cacheService.get(SMS_VERIFY_CODE_KEY + mobileNumber);
if(StringUtils.isEmpty(vCode)){
throw new AppException("验证码已失效");
}
if(!verifyCode.equals(vCode)){
throw new AppException("验证码不正确");
}
CustomerEntity update = new CustomerEntity();
update.setId(customer.getId());
update.setLastLoginAddress(loginIp);
update.setLastLoginTime(new Date());
this.update(update);
return customer;
}
@Override
public CustomerEntity doWeChatLogin(String openId, String loginIp) throws AppException {
CustomerEntity customer = this.selectOne(new CustomerQuery().openId(openId));
if(customer==null){
throw new AppException("用户未绑定微信");
}
CustomerEntity update = new CustomerEntity();
update.setId(customer.getId());
update.setLastLoginAddress(loginIp);
update.setLastLoginTime(new Date());
this.update(update);
return customer;
}
public static void main(String[] args){
try {
JSONObject jsonObject = new JSONObject();
jsonObject.put("appid","ADsUXLrS81vZDU95");
jsonObject.put("phone","18981841597");
jsonObject.put("type",SMS_TPYE);
Map<String, String> params = new HashMap<>();
params.put("appid","ADsUXLrS81vZDU95");
params.put("phone","18981841597");
params.put("type",SMS_TPYE);
String vCode = RandomUtil.randomNumbers(6);
params.put("json","[\"123456\",\"1\"]");
List<String> jj = new ArrayList<>();
jj.add("1111");
jj.add("2");
System.out.println(JSONObject.toJSON(jj).toString());
String[] json = new String[2];
json[0] = vCode;
json[1] = "1";
System.out.println(JSONObject.toJSON(json).toString());
params.put("json",JSONObject.toJSON(jj).toString());
// String resp = HttpUtil.doPost("http://sms.wx3.com.cn/api/index/index",params);
// System.out.println(resp);
}catch (Exception e){
}
} }
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerWorkCollectServiceImpl.java
View file @ b516bd52
...@@ -54,6 +54,10 @@ public class CustomerWorkCollectServiceImpl extends AbstractCRUDServiceImpl<Cust ...@@ -54,6 +54,10 @@ public class CustomerWorkCollectServiceImpl extends AbstractCRUDServiceImpl<Cust
protected void saveBefore(CustomerWorkCollectEntity entity, Context context) throws AppException { protected void saveBefore(CustomerWorkCollectEntity entity, Context context) throws AppException {
this.validData(entity, context); this.validData(entity, context);
entity.setCustomerId(this.getContextUserId(context)); entity.setCustomerId(this.getContextUserId(context));
DesignMasterplateEntity masterplateEntity = designMasterplateService.get(entity.getMasterplateId());
if(masterplateEntity!=null){
entity.setDesignType(masterplateEntity.getDesignType());
}
CustomerWorkCollectEntity query = new CustomerWorkCollectEntity(); CustomerWorkCollectEntity query = new CustomerWorkCollectEntity();
query.setCustomerId(entity.getCustomerId()); query.setCustomerId(entity.getCustomerId());
query.setMasterplateId(entity.getMasterplateId()); query.setMasterplateId(entity.getMasterplateId());
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/service/impl/CustomerWorkDesignServiceImpl.java
View file @ b516bd52
...@@ -7,10 +7,7 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; ...@@ -7,10 +7,7 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.common.code.WorkDesignStatusEnum; import com.mortals.xhx.common.code.WorkDesignStatusEnum;
import com.mortals.xhx.common.utils.StringUtils; import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.customer.dao.CustomerWorkDesignDao; import com.mortals.xhx.module.customer.dao.CustomerWorkDesignDao;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.*;
import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity;
import com.mortals.xhx.module.customer.model.CustomerWorkDesignStatEntity;
import com.mortals.xhx.module.customer.model.CustomerWorkDesignStatQuery;
import com.mortals.xhx.module.customer.service.CustomerService; import com.mortals.xhx.module.customer.service.CustomerService;
import com.mortals.xhx.module.customer.service.CustomerWorkDesignService; import com.mortals.xhx.module.customer.service.CustomerWorkDesignService;
import com.mortals.xhx.module.customer.service.CustomerWorkDesignStatService; import com.mortals.xhx.module.customer.service.CustomerWorkDesignStatService;
...@@ -22,6 +19,8 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -22,6 +19,8 @@ import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -65,8 +64,13 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo ...@@ -65,8 +64,13 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo
if(CollectionUtils.isEmpty(cwdList)){ if(CollectionUtils.isEmpty(cwdList)){
CustomerWorkDesignStatEntity cwdEntity = new CustomerWorkDesignStatEntity(); CustomerWorkDesignStatEntity cwdEntity = new CustomerWorkDesignStatEntity();
cwdEntity.setCustomerId(entity.getCustomerId()); cwdEntity.setCustomerId(entity.getCustomerId());
if(entity.getDesignType()==1) {
cwdEntity.setCustomerDesignPictures(1); cwdEntity.setCustomerDesignPictures(1);
cwdEntity.setCustomerDesignVideos(0); cwdEntity.setCustomerDesignVideos(0);
}else {
cwdEntity.setCustomerDesignPictures(0);
cwdEntity.setCustomerDesignVideos(1);
}
cwdEntity.setCreateTime(new Date()); cwdEntity.setCreateTime(new Date());
cwdEntity.setUpdateTime(new Date()); cwdEntity.setUpdateTime(new Date());
customerWorkDesignStatService.save(cwdEntity); customerWorkDesignStatService.save(cwdEntity);
...@@ -74,7 +78,11 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo ...@@ -74,7 +78,11 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo
CustomerWorkDesignStatEntity cwdEntity = cwdList.get(0); CustomerWorkDesignStatEntity cwdEntity = cwdList.get(0);
CustomerWorkDesignStatQuery updateEntity = new CustomerWorkDesignStatQuery(); CustomerWorkDesignStatQuery updateEntity = new CustomerWorkDesignStatQuery();
updateEntity.setId(cwdEntity.getId()); updateEntity.setId(cwdEntity.getId());
if(entity.getDesignType()==1) {
updateEntity.setCustomerDesignPicturesIncrement(1); updateEntity.setCustomerDesignPicturesIncrement(1);
}else {
updateEntity.setCustomerDesignVideosIncrement(1);
}
updateEntity.setUpdateTime(new Date()); updateEntity.setUpdateTime(new Date());
customerWorkDesignStatService.update(updateEntity); customerWorkDesignStatService.update(updateEntity);
} }
...@@ -135,6 +143,7 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo ...@@ -135,6 +143,7 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo
newMasterplate.setPreviewUrl(entity.getFrontCover()); newMasterplate.setPreviewUrl(entity.getFrontCover());
newMasterplate.setDraft(workDesign.getDraft()); newMasterplate.setDraft(workDesign.getDraft());
newMasterplate.setPlateType(entity.getPlateType()==null?1:entity.getPlateType()); newMasterplate.setPlateType(entity.getPlateType()==null?1:entity.getPlateType());
newMasterplate.setDesignType(workDesign.getDesignType());
newMasterplate.setCreateTime(new Date()); newMasterplate.setCreateTime(new Date());
designMasterplateService.save(newMasterplate,context); designMasterplateService.save(newMasterplate,context);
return 1; return 1;
...@@ -152,7 +161,8 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo ...@@ -152,7 +161,8 @@ public class CustomerWorkDesignServiceImpl extends AbstractCRUDServiceImpl<Custo
@Override @Override
public int remove(Long[] ids, Context context) throws AppException { public int remove(Long[] ids, Context context) throws AppException {
this.removeBefore(ids, context); this.removeBefore(ids, context);
List<CustomerWorkDesignEntity> list = this.get(ids,context); List<Long> idList = new ArrayList<>(Arrays.asList(ids));
List<CustomerWorkDesignEntity> list = this.find(new CustomerWorkDesignQuery().idList(idList));
int iRet = this.dao.delete(ids); int iRet = this.dao.delete(ids);
if(CollectionUtils.isNotEmpty(list)){ if(CollectionUtils.isNotEmpty(list)){
list.forEach(e->{ list.forEach(e->{
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerController.java
View file @ b516bd52
package com.mortals.xhx.module.customer.web; package com.mortals.xhx.module.customer.web;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.IBaseEnum; import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -9,13 +10,17 @@ import com.mortals.framework.model.PageInfo; ...@@ -9,13 +10,17 @@ import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.IUser; import com.mortals.framework.service.IUser;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.framework.utils.ReflectUtils;
import com.mortals.framework.utils.poi.ExcelUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.CustomerSatusEnum; import com.mortals.xhx.common.code.CustomerSatusEnum;
import com.mortals.xhx.common.code.CustomerSrcEnum; import com.mortals.xhx.common.code.CustomerSrcEnum;
import com.mortals.xhx.common.code.MemberLevelEnum; import com.mortals.xhx.common.code.MemberLevelEnum;
import com.mortals.xhx.common.code.SexEnum; import com.mortals.xhx.common.code.SexEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.LoginAESUtil;
import com.mortals.xhx.module.customer.model.CustomerEntity; import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.model.CustomerEntityExt;
import com.mortals.xhx.module.customer.model.CustomerQuery; import com.mortals.xhx.module.customer.model.CustomerQuery;
import com.mortals.xhx.module.customer.service.CustomerService; import com.mortals.xhx.module.customer.service.CustomerService;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -32,6 +37,9 @@ import java.util.*; ...@@ -32,6 +37,9 @@ import java.util.*;
@RequestMapping("customer") @RequestMapping("customer")
public class CustomerController extends BaseCRUDJsonBodyMappingController<CustomerService,CustomerEntity,Long> { public class CustomerController extends BaseCRUDJsonBodyMappingController<CustomerService,CustomerEntity,Long> {
private static final String AES_KEY = "0000000671595991";
private static final String AES_IV = "tdrdadq59tbss5n7";
public CustomerController(){ public CustomerController(){
super.setModuleDesc( "客户管理"); super.setModuleDesc( "客户管理");
} }
...@@ -45,6 +53,18 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -45,6 +53,18 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
super.init(model, context); super.init(model, context);
} }
@Override
protected void saveBefore(CustomerEntity entity, Map<String, Object> model, Context context) throws AppException {
if(StringUtils.isNotEmpty(entity.getPassword())) {
String oldPwd = LoginAESUtil.decrypt(entity.getPassword(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setPassword(oldPwd);
}
if(StringUtils.isNotEmpty(entity.getLoginName())) {
String loginName = LoginAESUtil.decrypt(entity.getLoginName(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setLoginName(loginName);
}
}
@Override @Override
protected void doListBefore(CustomerEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(CustomerEntity query, Map<String, Object> model, Context context) throws AppException {
Map<String,String> orderCols = new HashMap<>(); Map<String,String> orderCols = new HashMap<>();
...@@ -53,6 +73,7 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -53,6 +73,7 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
} }
@Override @Override
@UnAuth
public Rest<Object> list(@RequestBody(required = false) CustomerEntity query) { public Rest<Object> list(@RequestBody(required = false) CustomerEntity query) {
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
Rest<Object> ret = new Rest(); Rest<Object> ret = new Rest();
...@@ -64,8 +85,14 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -64,8 +85,14 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
PageInfo pageInfo = this.buildPageInfo(query); PageInfo pageInfo = this.buildPageInfo(query);
this.doListBefore(query, model, context); this.doListBefore(query, model, context);
Result result = this.getService().findExt(query, pageInfo, context); Result result = this.getService().findExt(query, pageInfo, context);
Map<String,Object> census = service.getCustomerCensus();
model.put("data", result.getList()); model.put("data", result.getList());
model.put("pageInfo", result.getPageInfo()); model.put("pageInfo", result.getPageInfo());
model.put("trial", census.get("trial"));
model.put("vip", census.get("vip"));
model.put("designer", census.get("designer"));
model.put("picturesCount", census.get("picturesCount"));
model.put("videosCount", census.get("videosCount"));
this.parsePageInfo(model, result.getPageInfo()); this.parsePageInfo(model, result.getPageInfo());
code = this.doListAfter(query, model, context); code = this.doListAfter(query, model, context);
this.recordSysLog(this.request, busiDesc + " 【成功】"); this.recordSysLog(this.request, busiDesc + " 【成功】");
...@@ -202,6 +229,18 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -202,6 +229,18 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
String busiDesc = "客户修改密码"; String busiDesc = "客户修改密码";
int code = 1; int code = 1;
try { try {
if(StringUtils.isNotEmpty(entity.getLoginName())) {
String loginName = LoginAESUtil.decrypt(entity.getLoginName(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setLoginName(loginName);
}
if(StringUtils.isNotEmpty(entity.getOldPassword())) {
String oldPwd = LoginAESUtil.decrypt(entity.getOldPassword(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setOldPassword(oldPwd);
}
if(StringUtils.isNotEmpty(entity.getNewPassword())) {
String newPwd = LoginAESUtil.decrypt(entity.getNewPassword(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setNewPassword(newPwd);
}
entity.setUpdateTime(new Date()); entity.setUpdateTime(new Date());
entity.setId(user.getId()); entity.setId(user.getId());
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
...@@ -241,6 +280,14 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -241,6 +280,14 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
String busiDesc = "客户修改密码"; String busiDesc = "客户修改密码";
int code = 1; int code = 1;
try { try {
if(StringUtils.isNotEmpty(entity.getOldPassword())) {
String oldPwd = LoginAESUtil.decrypt(entity.getOldPassword(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setOldPassword(oldPwd);
}
if(StringUtils.isNotEmpty(entity.getNewPassword())) {
String newPwd = LoginAESUtil.decrypt(entity.getNewPassword(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setNewPassword(newPwd);
}
entity.setUpdateTime(new Date()); entity.setUpdateTime(new Date());
entity.setId(user.getId()); entity.setId(user.getId());
entity.setUpdateUserId(user.getId()); entity.setUpdateUserId(user.getId());
...@@ -280,6 +327,10 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -280,6 +327,10 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
String busiDesc = "管理员修改密码"; String busiDesc = "管理员修改密码";
int code = 1; int code = 1;
try { try {
if(StringUtils.isNotEmpty(entity.getNewPassword())) {
String newPwd = LoginAESUtil.decrypt(entity.getNewPassword(), AES_KEY, AES_IV, LoginAESUtil.AES_CBC);
entity.setNewPassword(newPwd);
}
this.service.changePasswordByAdmin(entity, context); this.service.changePasswordByAdmin(entity, context);
model.put("id", entity.getId()); model.put("id", entity.getId());
model.put("entity", entity); model.put("entity", entity);
...@@ -300,4 +351,31 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom ...@@ -300,4 +351,31 @@ public class CustomerController extends BaseCRUDJsonBodyMappingController<Custom
return ret.toJSONString(); return ret.toJSONString();
} }
@Override
@UnAuth
public void exportExcel(@RequestBody CustomerEntity query) {
Context context = this.getContext();
String busiDesc = "导出" + this.getModuleDesc();
ArrayList properties = new ArrayList();
try {
this.doExportBefore(context, query,properties);
String name = StringUtils.trim(this.moduleDesc);
if (StringUtils.isEmpty(name)) {
name = System.currentTimeMillis() + "";
}
String fileName = name + ".xlsx";
PageInfo pageInfo = new PageInfo(-1);
List<CustomerEntityExt> list = this.service.findExt(query, pageInfo, this.getContext()).getList();
Class<CustomerEntityExt> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
ExcelUtil<CustomerEntityExt, Long> util = new ExcelUtil(tClass);
byte[] data = util.exportExcel(list, name);
this.responseStream(this.response, data, fileName);
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var11) {
this.doException(this.request, "导出异常", new HashMap(), var11);
}
}
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkCollectController.java
View file @ b516bd52
package com.mortals.xhx.module.customer.web; package com.mortals.xhx.module.customer.web;
import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.DesignTypeEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -43,6 +45,7 @@ public class CustomerWorkCollectController extends BaseCRUDJsonBodyMappingContro ...@@ -43,6 +45,7 @@ public class CustomerWorkCollectController extends BaseCRUDJsonBodyMappingContro
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "designType", IBaseEnum.getEnumMap(DesignTypeEnum.class));
super.init(model, context); super.init(model, context);
} }
......
datav-manager/src/main/java/com/mortals/xhx/module/customer/web/CustomerWorkDesignController.java
View file @ b516bd52
...@@ -6,20 +6,24 @@ import com.mortals.framework.annotation.UnAuth; ...@@ -6,20 +6,24 @@ import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.IBaseEnum; import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.framework.service.IUser;
import com.mortals.framework.util.DateUtils; import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.DesignTypeEnum;
import com.mortals.xhx.common.code.WorkDesignStatusEnum; import com.mortals.xhx.common.code.WorkDesignStatusEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity; import com.mortals.xhx.module.customer.model.CustomerWorkDesignEntity;
import com.mortals.xhx.module.customer.service.CustomerWorkDesignService; import com.mortals.xhx.module.customer.service.CustomerWorkDesignService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* *
...@@ -39,6 +43,7 @@ public class CustomerWorkDesignController extends BaseCRUDJsonBodyMappingControl ...@@ -39,6 +43,7 @@ public class CustomerWorkDesignController extends BaseCRUDJsonBodyMappingControl
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "workDesignStatus", IBaseEnum.getEnumMap(WorkDesignStatusEnum.class)); this.addDict(model, "workDesignStatus", IBaseEnum.getEnumMap(WorkDesignStatusEnum.class));
this.addDict(model, "designType", IBaseEnum.getEnumMap(DesignTypeEnum.class));
super.init(model, context); super.init(model, context);
} }
...@@ -85,6 +90,7 @@ public class CustomerWorkDesignController extends BaseCRUDJsonBodyMappingControl ...@@ -85,6 +90,7 @@ public class CustomerWorkDesignController extends BaseCRUDJsonBodyMappingControl
throw new AppException("非法用户,不可访问"); throw new AppException("非法用户,不可访问");
} }
entity.setCustomerId(this.getCurUser().getId()); entity.setCustomerId(this.getCurUser().getId());
entity.setUpdateTime(entity.getCreateTime());
if(CollectionUtils.isNotEmpty(entity.getDesignContent())) { if(CollectionUtils.isNotEmpty(entity.getDesignContent())) {
entity.setDraft(JSONObject.toJSONString(entity.getDesignContent())); entity.setDraft(JSONObject.toJSONString(entity.getDesignContent()));
} }
......
datav-manager/src/main/java/com/mortals/xhx/module/design/model/DesignMasterplateEntity.java
View file @ b516bd52
package com.mortals.xhx.module.design.model; package com.mortals.xhx.module.design.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.design.model.vo.DesignMasterplateVo; import com.mortals.xhx.module.design.model.vo.DesignMasterplateVo;
import lombok.Data;
/** /**
* 模版管理实体对象 * 模版管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-26 * @date 2023-07-11
*/ */
@Data
public class DesignMasterplateEntity extends DesignMasterplateVo { public class DesignMasterplateEntity extends DesignMasterplateVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -72,210 +72,10 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -72,210 +72,10 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
* 版式。1：横版2竖版默认：1 * 版式。1：横版2竖版默认：1
*/ */
private Integer plateType; private Integer plateType;
public DesignMasterplateEntity(){}
/**
* 获取 模版名称
* @return String
*/
public String getMasterplateName(){
return masterplateName;
}
/**
* 设置 模版名称
* @param masterplateName
*/
public void setMasterplateName(String masterplateName){
this.masterplateName = masterplateName;
}
/**
* 获取 模版编码
* @return Integer
*/
public Integer getMasterplateCode(){
return masterplateCode;
}
/**
* 设置 模版编码
* @param masterplateCode
*/
public void setMasterplateCode(Integer masterplateCode){
this.masterplateCode = masterplateCode;
}
/**
* 获取 发布人
* @return Long
*/
public Long getCustomerId(){
return customerId;
}
/**
* 设置 发布人
* @param customerId
*/
public void setCustomerId(Long customerId){
this.customerId = customerId;
}
/**
* 获取 发布人名称
* @return String
*/
public String getCustomerName(){
return customerName;
}
/**
* 设置 发布人名称
* @param customerName
*/
public void setCustomerName(String customerName){
this.customerName = customerName;
}
/**
* 获取 模版描述
* @return String
*/
public String getMasterplateDesc(){
return masterplateDesc;
}
/**
* 设置 模版描述
* @param masterplateDesc
*/
public void setMasterplateDesc(String masterplateDesc){
this.masterplateDesc = masterplateDesc;
}
/**
* 获取 模版下载地址（相对地址）
* @return String
*/
public String getMasterplatePath(){
return masterplatePath;
}
/**
* 设置 模版下载地址（相对地址）
* @param masterplatePath
*/
public void setMasterplatePath(String masterplatePath){
this.masterplatePath = masterplatePath;
}
/**
* 获取 模版引用的图片
* @return String
*/
public String getPictureIds(){
return pictureIds;
}
/**
* 设置 模版引用的图片
* @param pictureIds
*/
public void setPictureIds(String pictureIds){
this.pictureIds = pictureIds;
}
/** /**
* 获取 模版引用的素材 * 作品类型：1:图片，2:视频
* @return String
*/ */
public String getPictureSrcIds(){ private Integer designType;
return pictureSrcIds;
}
/**
* 设置 模版引用的素材
* @param pictureSrcIds
*/
public void setPictureSrcIds(String pictureSrcIds){
this.pictureSrcIds = pictureSrcIds;
}
/**
* 获取 模版引用的背景
* @return String
*/
public String getPictureBackgroundIds(){
return pictureBackgroundIds;
}
/**
* 设置 模版引用的背景
* @param pictureBackgroundIds
*/
public void setPictureBackgroundIds(String pictureBackgroundIds){
this.pictureBackgroundIds = pictureBackgroundIds;
}
/**
* 获取 模版引用的字体
* @return String
*/
public String getFontIds(){
return fontIds;
}
/**
* 设置 模版引用的字体
* @param fontIds
*/
public void setFontIds(String fontIds){
this.fontIds = fontIds;
}
/**
* 获取 模版被引用的次数。默认：0
* @return Integer
*/
public Integer getMasterplateUseNum(){
return masterplateUseNum;
}
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNum
*/
public void setMasterplateUseNum(Integer masterplateUseNum){
this.masterplateUseNum = masterplateUseNum;
}
/**
* 获取 作品图片预览地址（相对地址）
* @return String
*/
public String getPreviewUrl(){
return previewUrl;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrl
*/
public void setPreviewUrl(String previewUrl){
this.previewUrl = previewUrl;
}
/**
* 获取 设计草稿
* @return String
*/
public String getDraft(){
return draft;
}
/**
* 设置 设计草稿
* @param draft
*/
public void setDraft(String draft){
this.draft = draft;
}
/**
* 获取 版式。1：横版2竖版默认：1
* @return Integer
*/
public Integer getPlateType(){
return plateType;
}
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateType
*/
public void setPlateType(Integer plateType){
this.plateType = plateType;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -292,32 +92,13 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -292,32 +92,13 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",masterplateName:").append(getMasterplateName());
sb.append(",masterplateCode:").append(getMasterplateCode());
sb.append(",customerId:").append(getCustomerId());
sb.append(",customerName:").append(getCustomerName());
sb.append(",masterplateDesc:").append(getMasterplateDesc());
sb.append(",masterplatePath:").append(getMasterplatePath());
sb.append(",pictureIds:").append(getPictureIds());
sb.append(",pictureSrcIds:").append(getPictureSrcIds());
sb.append(",pictureBackgroundIds:").append(getPictureBackgroundIds());
sb.append(",fontIds:").append(getFontIds());
sb.append(",masterplateUseNum:").append(getMasterplateUseNum());
sb.append(",previewUrl:").append(getPreviewUrl());
sb.append(",draft:").append(getDraft());
sb.append(",plateType:").append(getPlateType());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.masterplateName = ""; this.masterplateName = "";
this.masterplateCode = null; this.masterplateCode = -1;
this.customerId = null; this.customerId = -1L;
this.customerName = ""; this.customerName = "";
...@@ -333,12 +114,14 @@ public class DesignMasterplateEntity extends DesignMasterplateVo { ...@@ -333,12 +114,14 @@ public class DesignMasterplateEntity extends DesignMasterplateVo {
this.fontIds = ""; this.fontIds = "";
this.masterplateUseNum = null; this.masterplateUseNum = -1;
this.previewUrl = ""; this.previewUrl = "";
this.draft = ""; this.draft = "";
this.plateType = null; this.plateType = -1;
this.designType = 1;
} }
} }
\ No newline at end of file
datav-manager/src/main/java/com/mortals/xhx/module/design/model/DesignMasterplateQuery.java
View file @ b516bd52
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.design.model.DesignMasterplateEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.design.model.DesignMasterplateEntity;
* 模版管理查询对象 * 模版管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-26 * @date 2023-07-11
*/ */
public class DesignMasterplateQuery extends DesignMasterplateEntity { public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -21,9 +21,14 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -21,9 +21,14 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 模版名称 */ /** 模版名称 */
private List<String> masterplateNameList; private List<String> masterplateNameList;
/** 模版名称排除列表 */
private List <String> masterplateNameNotList;
/** 开始 模版编码 */ /** 开始 模版编码 */
private Integer masterplateCodeStart; private Integer masterplateCodeStart;
...@@ -36,6 +41,9 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -36,6 +41,9 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 模版编码列表 */ /** 模版编码列表 */
private List <Integer> masterplateCodeList; private List <Integer> masterplateCodeList;
/** 模版编码排除列表 */
private List <Integer> masterplateCodeNotList;
/** 开始 发布人 */ /** 开始 发布人 */
private Long customerIdStart; private Long customerIdStart;
...@@ -48,9 +56,14 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -48,9 +56,14 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 发布人列表 */ /** 发布人列表 */
private List <Long> customerIdList; private List <Long> customerIdList;
/** 发布人排除列表 */
private List <Long> customerIdNotList;
/** 发布人名称 */ /** 发布人名称 */
private List<String> customerNameList; private List<String> customerNameList;
/** 发布人名称排除列表 */
private List <String> customerNameNotList;
/** 开始 发布时间 */ /** 开始 发布时间 */
private String createTimeStart; private String createTimeStart;
...@@ -60,21 +73,33 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -60,21 +73,33 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 模版描述 */ /** 模版描述 */
private List<String> masterplateDescList; private List<String> masterplateDescList;
/** 模版描述排除列表 */
private List <String> masterplateDescNotList;
/** 模版下载地址（相对地址） */ /** 模版下载地址（相对地址） */
private List<String> masterplatePathList; private List<String> masterplatePathList;
/** 模版下载地址（相对地址）排除列表 */
private List <String> masterplatePathNotList;
/** 模版引用的图片 */ /** 模版引用的图片 */
private List<String> pictureIdsList; private List<String> pictureIdsList;
/** 模版引用的图片排除列表 */
private List <String> pictureIdsNotList;
/** 模版引用的素材 */ /** 模版引用的素材 */
private List<String> pictureSrcIdsList; private List<String> pictureSrcIdsList;
/** 模版引用的素材排除列表 */
private List <String> pictureSrcIdsNotList;
/** 模版引用的背景 */ /** 模版引用的背景 */
private List<String> pictureBackgroundIdsList; private List<String> pictureBackgroundIdsList;
/** 模版引用的背景排除列表 */
private List <String> pictureBackgroundIdsNotList;
/** 模版引用的字体 */ /** 模版引用的字体 */
private List<String> fontIdsList; private List<String> fontIdsList;
/** 模版引用的字体排除列表 */
private List <String> fontIdsNotList;
/** 开始 模版被引用的次数。默认：0 */ /** 开始 模版被引用的次数。默认：0 */
private Integer masterplateUseNumStart; private Integer masterplateUseNumStart;
...@@ -87,12 +112,19 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -87,12 +112,19 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 模版被引用的次数。默认：0列表 */ /** 模版被引用的次数。默认：0列表 */
private List <Integer> masterplateUseNumList; private List <Integer> masterplateUseNumList;
/** 模版被引用的次数。默认：0排除列表 */
private List <Integer> masterplateUseNumNotList;
/** 作品图片预览地址（相对地址） */ /** 作品图片预览地址（相对地址） */
private List<String> previewUrlList; private List<String> previewUrlList;
/** 作品图片预览地址（相对地址）排除列表 */
private List <String> previewUrlNotList;
/** 设计草稿 */ /** 设计草稿 */
private List<String> draftList; private List<String> draftList;
/** 设计草稿排除列表 */
private List <String> draftNotList;
/** 开始 版式。1：横版2竖版默认：1 */ /** 开始 版式。1：横版2竖版默认：1 */
private Integer plateTypeStart; private Integer plateTypeStart;
...@@ -105,6 +137,24 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -105,6 +137,24 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
/** 版式。1：横版2竖版默认：1列表 */ /** 版式。1：横版2竖版默认：1列表 */
private List <Integer> plateTypeList; private List <Integer> plateTypeList;
/** 版式。1：横版2竖版默认：1排除列表 */
private List <Integer> plateTypeNotList;
/** 开始 作品类型：1:图片，2:视频 */
private Integer designTypeStart;
/** 结束 作品类型：1:图片，2:视频 */
private Integer designTypeEnd;
/** 增加 作品类型：1:图片，2:视频 */
private Integer designTypeIncrement;
/** 作品类型：1:图片，2:视频列表 */
private List <Integer> designTypeList;
/** 作品类型：1:图片，2:视频排除列表 */
private List <Integer> designTypeNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<DesignMasterplateQuery> orConditionList; private List<DesignMasterplateQuery> orConditionList;
...@@ -177,6 +227,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -177,6 +227,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 模版名称 * 获取 模版名称
* @return masterplateNameList * @return masterplateNameList
...@@ -192,6 +259,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -192,6 +259,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setMasterplateNameList(List<String> masterplateNameList){ public void setMasterplateNameList(List<String> masterplateNameList){
this.masterplateNameList = masterplateNameList; this.masterplateNameList = masterplateNameList;
} }
/**
* 获取 模版名称
* @return masterplateNameNotList
*/
public List<String> getMasterplateNameNotList(){
return this.masterplateNameNotList;
}
/**
* 设置 模版名称
* @param masterplateNameNotList
*/
public void setMasterplateNameNotList(List<String> masterplateNameNotList){
this.masterplateNameNotList = masterplateNameNotList;
}
/** /**
* 获取 开始 模版编码 * 获取 开始 模版编码
* @return masterplateCodeStart * @return masterplateCodeStart
...@@ -256,6 +340,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -256,6 +340,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
this.masterplateCodeList = masterplateCodeList; this.masterplateCodeList = masterplateCodeList;
} }
/**
* 获取 模版编码
* @return masterplateCodeNotList
*/
public List<Integer> getMasterplateCodeNotList(){
return this.masterplateCodeNotList;
}
/**
* 设置 模版编码
* @param masterplateCodeNotList
*/
public void setMasterplateCodeNotList(List<Integer> masterplateCodeNotList){
this.masterplateCodeNotList = masterplateCodeNotList;
}
/** /**
* 获取 开始 发布人 * 获取 开始 发布人
* @return customerIdStart * @return customerIdStart
...@@ -320,6 +421,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -320,6 +421,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
this.customerIdList = customerIdList; this.customerIdList = customerIdList;
} }
/**
* 获取 发布人
* @return customerIdNotList
*/
public List<Long> getCustomerIdNotList(){
return this.customerIdNotList;
}
/**
* 设置 发布人
* @param customerIdNotList
*/
public void setCustomerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
}
/** /**
* 获取 发布人名称 * 获取 发布人名称
* @return customerNameList * @return customerNameList
...@@ -335,6 +453,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -335,6 +453,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setCustomerNameList(List<String> customerNameList){ public void setCustomerNameList(List<String> customerNameList){
this.customerNameList = customerNameList; this.customerNameList = customerNameList;
} }
/**
* 获取 发布人名称
* @return customerNameNotList
*/
public List<String> getCustomerNameNotList(){
return this.customerNameNotList;
}
/**
* 设置 发布人名称
* @param customerNameNotList
*/
public void setCustomerNameNotList(List<String> customerNameNotList){
this.customerNameNotList = customerNameNotList;
}
/** /**
* 获取 开始 发布时间 * 获取 开始 发布时间
* @return createTimeStart * @return createTimeStart
...@@ -382,6 +517,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -382,6 +517,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setMasterplateDescList(List<String> masterplateDescList){ public void setMasterplateDescList(List<String> masterplateDescList){
this.masterplateDescList = masterplateDescList; this.masterplateDescList = masterplateDescList;
} }
/**
* 获取 模版描述
* @return masterplateDescNotList
*/
public List<String> getMasterplateDescNotList(){
return this.masterplateDescNotList;
}
/**
* 设置 模版描述
* @param masterplateDescNotList
*/
public void setMasterplateDescNotList(List<String> masterplateDescNotList){
this.masterplateDescNotList = masterplateDescNotList;
}
/** /**
* 获取 模版下载地址（相对地址） * 获取 模版下载地址（相对地址）
* @return masterplatePathList * @return masterplatePathList
...@@ -397,6 +549,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -397,6 +549,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setMasterplatePathList(List<String> masterplatePathList){ public void setMasterplatePathList(List<String> masterplatePathList){
this.masterplatePathList = masterplatePathList; this.masterplatePathList = masterplatePathList;
} }
/**
* 获取 模版下载地址（相对地址）
* @return masterplatePathNotList
*/
public List<String> getMasterplatePathNotList(){
return this.masterplatePathNotList;
}
/**
* 设置 模版下载地址（相对地址）
* @param masterplatePathNotList
*/
public void setMasterplatePathNotList(List<String> masterplatePathNotList){
this.masterplatePathNotList = masterplatePathNotList;
}
/** /**
* 获取 模版引用的图片 * 获取 模版引用的图片
* @return pictureIdsList * @return pictureIdsList
...@@ -412,6 +581,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -412,6 +581,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setPictureIdsList(List<String> pictureIdsList){ public void setPictureIdsList(List<String> pictureIdsList){
this.pictureIdsList = pictureIdsList; this.pictureIdsList = pictureIdsList;
} }
/**
* 获取 模版引用的图片
* @return pictureIdsNotList
*/
public List<String> getPictureIdsNotList(){
return this.pictureIdsNotList;
}
/**
* 设置 模版引用的图片
* @param pictureIdsNotList
*/
public void setPictureIdsNotList(List<String> pictureIdsNotList){
this.pictureIdsNotList = pictureIdsNotList;
}
/** /**
* 获取 模版引用的素材 * 获取 模版引用的素材
* @return pictureSrcIdsList * @return pictureSrcIdsList
...@@ -427,6 +613,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -427,6 +613,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setPictureSrcIdsList(List<String> pictureSrcIdsList){ public void setPictureSrcIdsList(List<String> pictureSrcIdsList){
this.pictureSrcIdsList = pictureSrcIdsList; this.pictureSrcIdsList = pictureSrcIdsList;
} }
/**
* 获取 模版引用的素材
* @return pictureSrcIdsNotList
*/
public List<String> getPictureSrcIdsNotList(){
return this.pictureSrcIdsNotList;
}
/**
* 设置 模版引用的素材
* @param pictureSrcIdsNotList
*/
public void setPictureSrcIdsNotList(List<String> pictureSrcIdsNotList){
this.pictureSrcIdsNotList = pictureSrcIdsNotList;
}
/** /**
* 获取 模版引用的背景 * 获取 模版引用的背景
* @return pictureBackgroundIdsList * @return pictureBackgroundIdsList
...@@ -442,6 +645,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -442,6 +645,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setPictureBackgroundIdsList(List<String> pictureBackgroundIdsList){ public void setPictureBackgroundIdsList(List<String> pictureBackgroundIdsList){
this.pictureBackgroundIdsList = pictureBackgroundIdsList; this.pictureBackgroundIdsList = pictureBackgroundIdsList;
} }
/**
* 获取 模版引用的背景
* @return pictureBackgroundIdsNotList
*/
public List<String> getPictureBackgroundIdsNotList(){
return this.pictureBackgroundIdsNotList;
}
/**
* 设置 模版引用的背景
* @param pictureBackgroundIdsNotList
*/
public void setPictureBackgroundIdsNotList(List<String> pictureBackgroundIdsNotList){
this.pictureBackgroundIdsNotList = pictureBackgroundIdsNotList;
}
/** /**
* 获取 模版引用的字体 * 获取 模版引用的字体
* @return fontIdsList * @return fontIdsList
...@@ -457,6 +677,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -457,6 +677,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setFontIdsList(List<String> fontIdsList){ public void setFontIdsList(List<String> fontIdsList){
this.fontIdsList = fontIdsList; this.fontIdsList = fontIdsList;
} }
/**
* 获取 模版引用的字体
* @return fontIdsNotList
*/
public List<String> getFontIdsNotList(){
return this.fontIdsNotList;
}
/**
* 设置 模版引用的字体
* @param fontIdsNotList
*/
public void setFontIdsNotList(List<String> fontIdsNotList){
this.fontIdsNotList = fontIdsNotList;
}
/** /**
* 获取 开始 模版被引用的次数。默认：0 * 获取 开始 模版被引用的次数。默认：0
* @return masterplateUseNumStart * @return masterplateUseNumStart
...@@ -521,6 +758,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -521,6 +758,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
this.masterplateUseNumList = masterplateUseNumList; this.masterplateUseNumList = masterplateUseNumList;
} }
/**
* 获取 模版被引用的次数。默认：0
* @return masterplateUseNumNotList
*/
public List<Integer> getMasterplateUseNumNotList(){
return this.masterplateUseNumNotList;
}
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNumNotList
*/
public void setMasterplateUseNumNotList(List<Integer> masterplateUseNumNotList){
this.masterplateUseNumNotList = masterplateUseNumNotList;
}
/** /**
* 获取 作品图片预览地址（相对地址） * 获取 作品图片预览地址（相对地址）
* @return previewUrlList * @return previewUrlList
...@@ -536,6 +790,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -536,6 +790,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setPreviewUrlList(List<String> previewUrlList){ public void setPreviewUrlList(List<String> previewUrlList){
this.previewUrlList = previewUrlList; this.previewUrlList = previewUrlList;
} }
/**
* 获取 作品图片预览地址（相对地址）
* @return previewUrlNotList
*/
public List<String> getPreviewUrlNotList(){
return this.previewUrlNotList;
}
/**
* 设置 作品图片预览地址（相对地址）
* @param previewUrlNotList
*/
public void setPreviewUrlNotList(List<String> previewUrlNotList){
this.previewUrlNotList = previewUrlNotList;
}
/** /**
* 获取 设计草稿 * 获取 设计草稿
* @return draftList * @return draftList
...@@ -551,6 +822,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -551,6 +822,23 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
public void setDraftList(List<String> draftList){ public void setDraftList(List<String> draftList){
this.draftList = draftList; this.draftList = draftList;
} }
/**
* 获取 设计草稿
* @return draftNotList
*/
public List<String> getDraftNotList(){
return this.draftNotList;
}
/**
* 设置 设计草稿
* @param draftNotList
*/
public void setDraftNotList(List<String> draftNotList){
this.draftNotList = draftNotList;
}
/** /**
* 获取 开始 版式。1：横版2竖版默认：1 * 获取 开始 版式。1：横版2竖版默认：1
* @return plateTypeStart * @return plateTypeStart
...@@ -615,6 +903,104 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -615,6 +903,104 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
this.plateTypeList = plateTypeList; this.plateTypeList = plateTypeList;
} }
/**
* 获取 版式。1：横版2竖版默认：1
* @return plateTypeNotList
*/
public List<Integer> getPlateTypeNotList(){
return this.plateTypeNotList;
}
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateTypeNotList
*/
public void setPlateTypeNotList(List<Integer> plateTypeNotList){
this.plateTypeNotList = plateTypeNotList;
}
/**
* 获取 开始 作品类型：1:图片，2:视频
* @return designTypeStart
*/
public Integer getDesignTypeStart(){
return this.designTypeStart;
}
/**
* 设置 开始 作品类型：1:图片，2:视频
* @param designTypeStart
*/
public void setDesignTypeStart(Integer designTypeStart){
this.designTypeStart = designTypeStart;
}
/**
* 获取 结束 作品类型：1:图片，2:视频
* @return $designTypeEnd
*/
public Integer getDesignTypeEnd(){
return this.designTypeEnd;
}
/**
* 设置 结束 作品类型：1:图片，2:视频
* @param designTypeEnd
*/
public void setDesignTypeEnd(Integer designTypeEnd){
this.designTypeEnd = designTypeEnd;
}
/**
* 获取 增加 作品类型：1:图片，2:视频
* @return designTypeIncrement
*/
public Integer getDesignTypeIncrement(){
return this.designTypeIncrement;
}
/**
* 设置 增加 作品类型：1:图片，2:视频
* @param designTypeIncrement
*/
public void setDesignTypeIncrement(Integer designTypeIncrement){
this.designTypeIncrement = designTypeIncrement;
}
/**
* 获取 作品类型：1:图片，2:视频
* @return designTypeList
*/
public List<Integer> getDesignTypeList(){
return this.designTypeList;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeList
*/
public void setDesignTypeList(List<Integer> designTypeList){
this.designTypeList = designTypeList;
}
/**
* 获取 作品类型：1:图片，2:视频
* @return designTypeNotList
*/
public List<Integer> getDesignTypeNotList(){
return this.designTypeNotList;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeNotList
*/
public void setDesignTypeNotList(List<Integer> designTypeNotList){
this.designTypeNotList = designTypeNotList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -660,6 +1046,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -660,6 +1046,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public DesignMasterplateQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 模版名称 * 设置 模版名称
...@@ -724,6 +1119,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -724,6 +1119,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 模版编码
* @param masterplateCodeNotList
*/
public DesignMasterplateQuery masterplateCodeNotList(List<Integer> masterplateCodeNotList){
this.masterplateCodeNotList = masterplateCodeNotList;
return this;
}
/** /**
* 设置 发布人 * 设置 发布人
* @param customerId * @param customerId
...@@ -769,6 +1173,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -769,6 +1173,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 发布人
* @param customerIdNotList
*/
public DesignMasterplateQuery customerIdNotList(List<Long> customerIdNotList){
this.customerIdNotList = customerIdNotList;
return this;
}
/** /**
* 设置 发布人名称 * 设置 发布人名称
...@@ -948,6 +1361,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -948,6 +1361,15 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 模版被引用的次数。默认：0
* @param masterplateUseNumNotList
*/
public DesignMasterplateQuery masterplateUseNumNotList(List<Integer> masterplateUseNumNotList){
this.masterplateUseNumNotList = masterplateUseNumNotList;
return this;
}
/** /**
* 设置 作品图片预览地址（相对地址） * 设置 作品图片预览地址（相对地址）
...@@ -1031,6 +1453,69 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity { ...@@ -1031,6 +1453,69 @@ public class DesignMasterplateQuery extends DesignMasterplateEntity {
return this; return this;
} }
/**
* 设置 版式。1：横版2竖版默认：1
* @param plateTypeNotList
*/
public DesignMasterplateQuery plateTypeNotList(List<Integer> plateTypeNotList){
this.plateTypeNotList = plateTypeNotList;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designType
*/
public DesignMasterplateQuery designType(Integer designType){
setDesignType(designType);
return this;
}
/**
* 设置 开始 作品类型：1:图片，2:视频
* @param designTypeStart
*/
public DesignMasterplateQuery designTypeStart(Integer designTypeStart){
this.designTypeStart = designTypeStart;
return this;
}
/**
* 设置 结束 作品类型：1:图片，2:视频
* @param designTypeEnd
*/
public DesignMasterplateQuery designTypeEnd(Integer designTypeEnd){
this.designTypeEnd = designTypeEnd;
return this;
}
/**
* 设置 增加 作品类型：1:图片，2:视频
* @param designTypeIncrement
*/
public DesignMasterplateQuery designTypeIncrement(Integer designTypeIncrement){
this.designTypeIncrement = designTypeIncrement;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeList
*/
public DesignMasterplateQuery designTypeList(List<Integer> designTypeList){
this.designTypeList = designTypeList;
return this;
}
/**
* 设置 作品类型：1:图片，2:视频
* @param designTypeNotList
*/
public DesignMasterplateQuery designTypeNotList(List<Integer> designTypeNotList){
this.designTypeNotList = designTypeNotList;
return this;
}
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
datav-manager/src/main/java/com/mortals/xhx/module/design/web/DesignMasterplateController.java
View file @ b516bd52
package com.mortals.xhx.module.design.web; package com.mortals.xhx.module.design.web;
import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.DesignTypeEnum;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -45,6 +47,7 @@ public class DesignMasterplateController extends BaseCRUDJsonBodyMappingControll ...@@ -45,6 +47,7 @@ public class DesignMasterplateController extends BaseCRUDJsonBodyMappingControll
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "designType", IBaseEnum.getEnumMap(DesignTypeEnum.class));
super.init(model, context); super.init(model, context);
} }
......
datav-manager/src/main/java/com/mortals/xhx/module/picture/web/PictureGroupController.java
View file @ b516bd52
...@@ -52,8 +52,13 @@ public class PictureGroupController extends BaseCRUDJsonBodyMappingController<Pa ...@@ -52,8 +52,13 @@ public class PictureGroupController extends BaseCRUDJsonBodyMappingController<Pa
if(paramEntities.isEmpty()){ if(paramEntities.isEmpty()){
max = 1; max = 1;
}else { }else {
ParamEntity maxEntity = paramEntities.stream().max(Comparator.comparing(ParamEntity::getParamKey)).get(); for(ParamEntity item:paramEntities){
max = DataUtil.converStr2Int(maxEntity.getParamKey(),paramEntities.size())+1; int temp = DataUtil.converStr2Int(item.getParamKey(),0);
if(max < temp){
max = temp;
}
}
max++;
} }
entity.setParamKey(max+""); entity.setParamKey(max+"");
entity.setName("素材分组"); entity.setName("素材分组");
......
datav-manager/src/main/java/com/mortals/xhx/module/question/web/QuestionRecordController.java
View file @ b516bd52
package com.mortals.xhx.module.question.web; package com.mortals.xhx.module.question.web;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.IBaseEnum; import com.mortals.framework.common.IBaseEnum;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
...@@ -55,6 +56,7 @@ public class QuestionRecordController extends BaseCRUDJsonBodyMappingController< ...@@ -55,6 +56,7 @@ public class QuestionRecordController extends BaseCRUDJsonBodyMappingController<
} }
@PostMapping({"ask"}) @PostMapping({"ask"})
@UnAuth
public String ask(@RequestBody QuestionRecordEntity entity) { public String ask(@RequestBody QuestionRecordEntity entity) {
Map<String, Object> model = new HashMap(); Map<String, Object> model = new HashMap();
...@@ -62,14 +64,19 @@ public class QuestionRecordController extends BaseCRUDJsonBodyMappingController< ...@@ -62,14 +64,19 @@ public class QuestionRecordController extends BaseCRUDJsonBodyMappingController<
String busiDesc = "新增咨询" + this.getModuleDesc(); String busiDesc = "新增咨询" + this.getModuleDesc();
int code = 1; int code = 1;
try { try {
if(this.getCurUser()==null||this.getCurUser().getUserType()!= Constant.CUSTOMER_USER){ if(this.getCurUser()==null){
throw new AppException("非法用户,不可访问"); entity.setCustomerId(-1l);
} entity.setCustName("游客");
entity.setContactTelphone("12345678901");
entity.setOrganization("游客");
}else {
CustomerEntity customerEntity = customerService.get(this.getCurUser().getId()); CustomerEntity customerEntity = customerService.get(this.getCurUser().getId());
entity.setCustomerId(this.getCurUser().getId()); entity.setCustomerId(this.getCurUser().getId());
entity.setCustName(customerEntity.getCustName()); entity.setCustName(customerEntity.getCustName());
entity.setContactTelphone(customerEntity.getContactTelphone()); entity.setContactTelphone(customerEntity.getContactTelphone());
entity.setOrganization(customerEntity.getOrganization()); entity.setOrganization(customerEntity.getOrganization());
}
entity = this.service.ask(entity,context); entity = this.service.ask(entity,context);
model.put("entity", entity); model.put("entity", entity);
......
datav-manager/src/main/java/com/mortals/xhx/module/thirdlog/sms/SMSLoginController.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.thirdlog.sms;
import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.IAuthTokenService;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.base.login.web.LoginForm;
import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.service.CustomerService;
import com.mortals.xhx.module.thirdlog.sms.pdu.SMSLoginPdu;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping("sms")
public class SMSLoginController extends BaseJsonBodyController {
@Autowired
private CustomerService customerService;
@Autowired
private IAuthTokenService authTokenService;
@PostMapping({"send"})
@UnAuth
public Rest<Object> sendSmsVerifyCode(@RequestBody SMSLoginPdu smsLoginPdu){
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "发送手机验证码";
int code=1;
try {
customerService.sendSmsVerifyCode(smsLoginPdu.getMobileNumber());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
@PostMapping("login")
@UnAuth
public String login(@RequestBody SMSLoginPdu smsLoginPdu) throws Exception {
JSONObject ret = new JSONObject();
Map<String, Object> data = new HashMap<>();
String ip = super.getRequestIP(request);
CustomerEntity customerEntity = null;
try {
customerEntity = customerService.doSmsLogin(smsLoginPdu.getMobileNumber(), smsLoginPdu.getVerifyCode(), ip);
customerEntity.setLastLoginAddress(ip);
customerEntity.setLoginTime(System.currentTimeMillis());
customerEntity.setToken(IdUtil.fastSimpleUUID());
customerEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
String token = authTokenService.createToken(customerEntity);
data.put("token", token);
data.put("customer", customerEntity);
recordSysLog(request, customerEntity, "客户登录系统成功!");
ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
return ret.toJSONString();
} catch (Exception e) {
log.error("login error ", e);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString();
}
}
}
datav-manager/src/main/java/com/mortals/xhx/module/thirdlog/sms/pdu/SMSLoginPdu.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.thirdlog.sms.pdu;
import lombok.Data;
@Data
public class SMSLoginPdu {
/** 手机号码 */
private String mobileNumber;
/** 验证码 */
private String verifyCode;
}
datav-manager/src/main/java/com/mortals/xhx/module/thirdlog/wechat/WeChatLoginController.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.thirdlog.wechat;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.web.BaseJsonBodyController;
import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.module.customer.model.CustomerEntity;
import com.mortals.xhx.module.customer.service.CustomerService;
import com.mortals.xhx.module.thirdlog.sms.pdu.SMSLoginPdu;
import com.mortals.xhx.module.thirdlog.wechat.utils.WeChatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;
/**
* 微信扫码登录
*/
@RestController
@RequestMapping("wechat")
public class WeChatLoginController extends BaseJsonBodyController {
@Autowired
private CustomerService customerService;
@Autowired
private ICacheService cacheService;
private static String WX_VERIFY_CODE_KEY ="login:wx:verify:";
/**
* 微信appId
*/
@Value("${WeChat.pc.appID:wx55400ca31cbbe7fb}")
private String APP_ID;
/**
* 微信appSecret
*/
@Value("${WeChat.pc.appSecret:22555d29a9f914bac0400af5cf63d6b3}")
private String APP_SECRET;
@RequestMapping(
value = {"getLoginSoleCode"},
method = {RequestMethod.POST, RequestMethod.GET}
)
@UnAuth
public Rest<Object> sendSmsVerifyCode(){
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
String busiDesc = "获取微信登录验证码";
int code=1;
try {
String vCode = RandomUtil.randomNumbers(11);
cacheService.setnx(WX_VERIFY_CODE_KEY+vCode,vCode,90);
model.put("data",vCode);
model.put("message_info", busiDesc + "成功");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model.get("data"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
}
@RequestMapping(
value = {"wxLoginOAuth"},
method = {RequestMethod.POST, RequestMethod.GET}
)
@UnAuth
public String wxLoginOAuth(HttpServletRequest request, HttpServletResponse response){
JSONObject ret = new JSONObject();
Map<String, Object> data = new HashMap<>();
try {
// 第三方发起微信授权登录请求，微信用户允许授权第三方应用后，微信会拉起应用或重定向到第三方网站，并且带上授权临时票据code参数；
String loginCode = request.getParameter("code");
//前端扫码登入传来的时间戳
String loginState = request.getParameter("state");
//用户拒绝授权时code为空，微信也不会请求该接口。为了防止非法请求，若code为空则返回
if (StringUtils.isEmpty(loginCode)) {
throw new AppException("登入请求被拒绝");
}
if (StringUtils.isEmpty(loginState)) {
throw new AppException("请求状态异常");
}
String vCode = cacheService.get(WX_VERIFY_CODE_KEY + loginState);
if (StringUtils.isEmpty(vCode)){
throw new AppException("微信登录验证码失效");
}
Map<String,String> accessTokenMap = WeChatUtils.getAccessToken(loginCode,APP_ID,APP_SECRET);
String access_token = accessTokenMap.get("access_token");//接口调用凭证，登录后右上角展示数据需要该值去获取
String openid = accessTokenMap.get("openid");//授权用户唯一标识
String ip = super.getRequestIP(request);
CustomerEntity customerEntity = customerService.doWeChatLogin(openid,ip);
customerEntity.setLastLoginAddress(ip);
customerEntity.setLoginTime(System.currentTimeMillis());
customerEntity.setToken(IdUtil.fastSimpleUUID());
customerEntity.setExpireTime(DateUtils.addCurrDate(7).getTime());
String token = authTokenService.createToken(customerEntity);
data.put("token", token);
data.put("customer", customerEntity);
recordSysLog(request, customerEntity, "客户扫码登录系统成功!");
ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "用户登录系统成功!");
return ret.toJSONString();
} catch (Exception e) {
log.error("login error ", e);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString();
}
}
@RequestMapping(
value = {"bind"},
method = {RequestMethod.POST, RequestMethod.GET}
)
@UnAuth
public String bind(HttpServletRequest request, HttpServletResponse response){
JSONObject ret = new JSONObject();
Map<String, Object> data = new HashMap<>();
try {
// 第三方发起微信授权登录请求，微信用户允许授权第三方应用后，微信会拉起应用或重定向到第三方网站，并且带上授权临时票据code参数；
String loginCode = request.getParameter("code");
//前端扫码登入传来的时间戳
String loginState = request.getParameter("state");
//用户拒绝授权时code为空，微信也不会请求该接口。为了防止非法请求，若code为空则返回
if (StringUtils.isEmpty(loginCode)) {
throw new AppException("登入请求被拒绝");
}
if (StringUtils.isEmpty(loginState)) {
throw new AppException("请求状态异常");
}
String vCode = cacheService.get(WX_VERIFY_CODE_KEY + loginState);
if (StringUtils.isEmpty(vCode)){
throw new AppException("微信登录验证码失效");
}
Map<String,String> accessTokenMap = WeChatUtils.getAccessToken(loginCode,APP_ID,APP_SECRET);
String access_token = accessTokenMap.get("access_token");//接口调用凭证，登录后右上角展示数据需要该值去获取
String openid = accessTokenMap.get("openid");//授权用户唯一标识
data.put("openId", openid);
ret.put(KEY_RESULT_DATA, data);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "微信扫码成功!");
return ret.toJSONString();
} catch (Exception e) {
log.error("bind error ", e);
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e));
return ret.toJSONString();
}
}
}
datav-manager/src/main/java/com/mortals/xhx/module/thirdlog/wechat/utils/JsonUtils.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.thirdlog.wechat.utils;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
* description: json工具类 <br>
* version: 1.0 <br>
* @date: 2019/7/20 0019 上午 10:17 <br>
* @author: William <br>
*/
public class JsonUtils {
public static final ObjectMapper MAPPER = new ObjectMapper();
private static final Logger logger = LoggerFactory.getLogger(JsonUtils.class);
public static String serialize(Object obj) {
if (obj == null) {
return null;
}
if (obj.getClass() == String.class) {
return (String) obj;
}
try {
return MAPPER.writeValueAsString(obj);
} catch (JsonProcessingException e) {
logger.error("json序列化出错：" + obj, e);
return null;
}
}
public static <T> T parse(String json, Class<T> tClass) {
try {
return MAPPER.readValue(json, tClass);
} catch (IOException e) {
logger.error("json解析出错：" + json, e);
return null;
}
}
public static <E> List<E> parseList(String json, Class<E> eClass) {
try {
return MAPPER.readValue(json, MAPPER.getTypeFactory().constructCollectionType(List.class, eClass));
} catch (IOException e) {
logger.error("json解析出错：" + json, e);
return null;
}
}
public static <K, V> Map<K, V> parseMap(String json, Class<K> kClass, Class<V> vClass) {
try {
return MAPPER.readValue(json, MAPPER.getTypeFactory().constructMapType(Map.class, kClass, vClass));
} catch (IOException e) {
logger.error("json解析出错：" + json, e);
return null;
}
}
public static <T> T nativeRead(String json, TypeReference<T> type) {
try {
return MAPPER.readValue(json, type);
} catch (IOException e) {
logger.error("json解析出错：" + json, e);
return null;
}
}
}
datav-manager/src/main/java/com/mortals/xhx/module/thirdlog/wechat/utils/WeChatUtils.java 0 → 100644
View file @ b516bd52
package com.mortals.xhx.module.thirdlog.wechat.utils;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import org.springframework.beans.factory.annotation.Value;
import java.util.Map;
/**
* description: WeChatUtils 微信获取用户工具类<br>
*
* @date: 2021/8/19 0019 上午 10:05 <br>
* @author: William <br>
* version: 1.0 <br>
*/
public class WeChatUtils {
/**
* 获取微信accessToken路径
*/
private static final String GET_ACCESS_TOKEN_URL = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=APPID&secret=SECRET&code=CODE&grant_type=authorization_code";
/**
* 微信appId
*/
@Value("${WeChat.pc.appID:wx55400ca31cbbe7fb}")
private static String APP_ID;
/**
* 微信appSecret
*/
@Value("${WeChat.pc.appSecret:22555d29a9f914bac0400af5cf63d6b3}")
private static String APP_SECRET;
/**
* description: getAccessToken 根据code获取accessToken<br>
* version: 1.0 <br>
* @date: 2021/8/19 0019 上午 10:10 <br>
* @author: William <br>
* @param code 微信用户授权code
* @return java.util.Map<java.lang.String,java.lang.String>
*/
public static Map<String,String> getAccessToken(String code){
return getAccessToken(code,APP_ID,APP_SECRET);
}
/**
* description: getAccessToken 根据code获取微信用户信息，返回map如果正确map包含access_token ,如果错误则包含：errcode<br>
* version: 1.0 <br>
* @date: 2021/8/19 0019 上午 10:11 <br>
* @author: William <br>
* @param code 微信授权code
* @param appId 微信appId
* @param appSecret 微信appSecret
* @return java.util.Map<java.lang.String,java.lang.String>
*/
public static Map<String,String> getAccessToken(String code,String appId,String appSecret){
//判断所有字段不能为空
if(isAnyBlank(code,appId,appSecret)){
throw new IllegalArgumentException("参数错误");
}
String requestUrl = GET_ACCESS_TOKEN_URL.replace("APPID",appId)
.replace("SECRET",appSecret).replace("CODE",code);
String result = HttpUtil.get(requestUrl);
return JsonUtils.parseMap(result, String.class, String.class);
}
/**
* description: isAnyBlank 判断是否存在空字符串，Hutool未编写<br>
* version: 1.0 <br>
* @date: 2021/8/19 0019 上午 10:25 <br>
* @author: William <br>
* @param strs 字符串
* @return java.lang.Boolean
*/
public static Boolean isAnyBlank(CharSequence... strs){
//如果为空直接返回true
if (ArrayUtil.isEmpty(strs)) {
return true;
}
for (CharSequence str : strs) {
if (StrUtil.isBlank(str)) {
return true;
}
}
return false;
}
}
datav-manager/src/main/resources/bootstrap.yml
View file @ b516bd52
...@@ -18,12 +18,6 @@ spring: ...@@ -18,12 +18,6 @@ spring:
jackson: jackson:
date-format: yyyy-MM-dd HH:mm:ss date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8 time-zone: GMT+8
rabbitmq:
host: @profiles.rabbitmq.host@
port: @profiles.rabbitmq.port@
username: @profiles.rabbitmq.username@
password: @profiles.rabbitmq.password@
virtualHost: @profiles.rabbitmq.virtualhost@
security: security:
enable: true enable: true
user: user:
......
datav-manager/src/main/resources/sqlmap/base/system/UserPwdRecordMapper.xml 0 → 100644
View file @ b516bd52
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.base.system.user.dao.ibatis.UserPwdRecordDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="UserPwdRecordEntity" id="UserPwdRecordEntity-Map">
<id property="id" column="id" />
<result property="userId" column="userId" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))">
a.userId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="UserPwdRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user_pwd_record
(userId,loginName,loginPwd,createTime,createUserId)
VALUES
(#{userId},#{loginName},#{loginPwd},#{createTime},#{createUserId})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user_pwd_record
(userId,loginName,loginPwd,createTime,createUserId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.userId},#{item.loginName},#{item.loginPwd},#{item.createTime},#{item.createUserId})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_user_pwd_record as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('userId')) or (colPickMode==1 and !data.containsKey('userId'))">
a.userId=#{data.userId},
</if>
<if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))">
a.userId=ifnull(a.userId,0) + #{data.userIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_user_pwd_record as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="userId=(case" suffix="ELSE userId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('userId')) or (colPickMode==1 and !item.containsKey('userId'))">
when a.id=#{item.id} then #{item.userId}
</when>
<when test="(colPickMode==0 and item.containsKey('userIdIncrement')) or (colPickMode==1 and !item.containsKey('userIdIncrement'))">
when a.id=#{item.id} then ifnull(a.userId,0) + #{item.userIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
when a.id=#{item.id} then #{item.loginName}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))">
when a.id=#{item.id} then #{item.loginPwd}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="UserPwdRecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_user_pwd_record as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_user_pwd_record as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_user_pwd_record where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_user_pwd_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_user_pwd_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_user_pwd_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="UserPwdRecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_user_pwd_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_user_pwd_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('userId')">
<if test="conditionParamRef.userId != null ">
${_conditionType_} a.userId = #{${_conditionParam_}.userId}
</if>
<if test="conditionParamRef.userId == null">
${_conditionType_} a.userId is null
</if>
</if>
<if test="conditionParamRef.containsKey('userIdList') and conditionParamRef.userIdList.size() > 0">
${_conditionType_} a.userId in
<foreach collection="conditionParamRef.userIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userIdNotList') and conditionParamRef.userIdNotList.size() > 0">
${_conditionType_} a.userId not in
<foreach collection="conditionParamRef.userIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userIdStart') and conditionParamRef.userIdStart != null">
${_conditionType_} a.userId <![CDATA[ >= ]]> #{${_conditionParam_}.userIdStart}
</if>
<if test="conditionParamRef.containsKey('userIdEnd') and conditionParamRef.userIdEnd != null">
${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd}
</if>
<if test="conditionParamRef.containsKey('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
${_conditionType_} a.loginPwd not in
<foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('userId')">
a.userId
<if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
datav-manager/src/main/resources/sqlmap/base/system/user.xml
View file @ b516bd52
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
<result property="lastLoginAddress" column="lastLoginAddress" /> <result property="lastLoginAddress" column="lastLoginAddress" />
<result property="lastModPwdTime" column="lastModPwdTime" /> <result property="lastModPwdTime" column="lastModPwdTime" />
<result property="lastModPwdAddr" column="lastModPwdAddr" /> <result property="lastModPwdAddr" column="lastModPwdAddr" />
<result property="saltKey" column="saltKey" />
<result property="lastUpdatePwdTime" column="lastUpdatePwdTime" />
<result property="errorCount" column="errorCount" />
<result property="loginLock" column="loginLock" />
<result property="lockTime" column="lockTime" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -102,23 +107,38 @@ ...@@ -102,23 +107,38 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastModPwdAddr') or colPickMode == 1 and data.containsKey('lastModPwdAddr')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastModPwdAddr') or colPickMode == 1 and data.containsKey('lastModPwdAddr')))">
a.lastModPwdAddr as lastModPwdAddr, a.lastModPwdAddr as lastModPwdAddr,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('saltKey') or colPickMode == 1 and data.containsKey('saltKey')))">
a.saltKey,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastUpdatePwdTime') or colPickMode == 1 and data.containsKey('lastUpdatePwdTime')))">
a.lastUpdatePwdTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorCount') or colPickMode == 1 and data.containsKey('errorCount')))">
a.errorCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginLock') or colPickMode == 1 and data.containsKey('loginLock')))">
a.loginLock,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lockTime') or colPickMode == 1 and data.containsKey('lockTime')))">
a.lockTime,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 --> <!-- 新增 -->
<insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="UserEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr) (loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr,saltKey,lastUpdatePwdTime,errorCount,loginLock,lockTime)
VALUES VALUES
(#{loginName},#{loginPwd},#{loginPwd1},#{loginPwd2},#{loginPwd3},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteId},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress},#{lastModPwdTime},#{lastModPwdAddr}) (#{loginName},#{loginPwd},#{loginPwd1},#{loginPwd2},#{loginPwd3},#{loginLimitAddress},#{realName},#{mobile},#{phone},#{email},#{qq},#{userType},#{siteId},#{status},#{customerId},#{createTime},#{createUserId},#{createUserName},#{lastLoginTime},#{lastLoginAddress},#{lastModPwdTime},#{lastModPwdAddr},#{saltKey},#{lastUpdatePwdTime},#{errorCount},#{loginLock},#{lockTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_user insert into mortals_xhx_user
(loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr) (loginName,loginPwd,loginPwd1,loginPwd2,loginPwd3,loginLimitAddress,realName,mobile,phone,email,qq,userType,siteId,status,customerId,createTime,createUserId,createUserName,lastLoginTime,lastLoginAddress,lastModPwdTime,lastModPwdAddr,saltKey,lastUpdatePwdTime,errorCount,loginLock,lockTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.loginName},#{item.loginPwd},#{item.loginPwd1},#{item.loginPwd2},#{item.loginPwd3},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteId},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress},#{item.lastModPwdTime},#{item.lastModPwdAddr}) (#{item.loginName},#{item.loginPwd},#{item.loginPwd1},#{item.loginPwd2},#{item.loginPwd3},#{item.loginLimitAddress},#{item.realName},#{item.mobile},#{item.phone},#{item.email},#{item.qq},#{item.userType},#{item.siteId},#{item.status},#{item.customerId},#{item.createTime},#{item.createUserId},#{item.createUserName},#{item.lastLoginTime},#{item.lastLoginAddress},#{item.lastModPwdTime},#{item.lastModPwdAddr},#{item.saltKey},#{item.lastUpdatePwdTime},#{item.errorCount},#{item.loginLock},#{item.lockTime})
</foreach> </foreach>
</insert> </insert>
<!-- 根据ParamDto更新 --> <!-- 根据ParamDto更新 -->
...@@ -207,6 +227,27 @@ ...@@ -207,6 +227,27 @@
<if test="(colPickMode==0 and data.containsKey('lastModPwdAddr')) or (colPickMode==1 and !data.containsKey('lastModPwdAddr'))"> <if test="(colPickMode==0 and data.containsKey('lastModPwdAddr')) or (colPickMode==1 and !data.containsKey('lastModPwdAddr'))">
a.lastModPwdAddr=#{data.lastModPwdAddr}, a.lastModPwdAddr=#{data.lastModPwdAddr},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('saltKey')) or (colPickMode==1 and !data.containsKey('saltKey'))">
a.saltKey=#{data.saltKey},
</if>
<if test="(colPickMode==0 and data.containsKey('lastUpdatePwdTime')) or (colPickMode==1 and !data.containsKey('lastUpdatePwdTime'))">
a.lastUpdatePwdTime=#{data.lastUpdatePwdTime},
</if>
<if test="(colPickMode==0 and data.containsKey('errorCount')) or (colPickMode==1 and !data.containsKey('errorCount'))">
a.errorCount=#{data.errorCount},
</if>
<if test="(colPickMode==0 and data.containsKey('errorCountIncrement')) or (colPickMode==1 and !data.containsKey('errorCountIncrement'))">
a.errorCount=ifnull(a.errorCount,0) + #{data.errorCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('loginLock')) or (colPickMode==1 and !data.containsKey('loginLock'))">
a.loginLock=#{data.loginLock},
</if>
<if test="(colPickMode==0 and data.containsKey('loginLockIncrement')) or (colPickMode==1 and !data.containsKey('loginLockIncrement'))">
a.loginLock=ifnull(a.loginLock,0) + #{data.loginLockIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('lockTime')) or (colPickMode==1 and !data.containsKey('lockTime'))">
a.lockTime=#{data.lockTime},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -421,6 +462,51 @@ ...@@ -421,6 +462,51 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="saltKey=(case" suffix="ELSE saltKey end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('saltKey')) or (colPickMode==1 and !item.containsKey('saltKey'))">
when a.id=#{item.id} then #{item.saltKey}
</if>
</foreach>
</trim>
<trim prefix="lastUpdatePwdTime=(case" suffix="ELSE lastUpdatePwdTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('lastUpdatePwdTime')) or (colPickMode==1 and !item.containsKey('lastUpdatePwdTime'))">
when a.id=#{item.id} then #{item.lastUpdatePwdTime}
</if>
</foreach>
</trim>
<trim prefix="errorCount=(case" suffix="ELSE errorCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('errorCount')) or (colPickMode==1 and !item.containsKey('errorCount'))">
when a.id=#{item.id} then #{item.errorCount}
</when>
<when test="(colPickMode==0 and item.containsKey('errorCountIncrement')) or (colPickMode==1 and !item.containsKey('errorCountIncrement'))">
when a.id=#{item.id} then ifnull(a.errorCount,0) + #{item.errorCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="loginLock=(case" suffix="ELSE loginLock end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('loginLock')) or (colPickMode==1 and !item.containsKey('loginLock'))">
when a.id=#{item.id} then #{item.loginLock}
</when>
<when test="(colPickMode==0 and item.containsKey('loginLockIncrement')) or (colPickMode==1 and !item.containsKey('loginLockIncrement'))">
when a.id=#{item.id} then ifnull(a.loginLock,0) + #{item.loginLockIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="lockTime=(case" suffix="ELSE lockTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('lockTime')) or (colPickMode==1 and !item.containsKey('lockTime'))">
when a.id=#{item.id} then #{item.lockTime}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -901,6 +987,110 @@ ...@@ -901,6 +987,110 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('saltKey')">
<if test="conditionParamRef.saltKey != null and conditionParamRef.saltKey != ''">
${_conditionType_} a.saltKey like #{${_conditionParam_}.saltKey}
</if>
<if test="conditionParamRef.saltKey == null">
${_conditionType_} a.saltKey is null
</if>
</if>
<if test="conditionParamRef.containsKey('saltKeyList')">
${_conditionType_} a.saltKey in
<foreach collection="conditionParamRef.saltKeyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('saltKeyNotList')">
${_conditionType_} a.saltKey not in
<foreach collection="conditionParamRef.saltKeyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('lastUpdatePwdTime')">
<if test="conditionParamRef.lastUpdatePwdTime != null ">
${_conditionType_} a.lastUpdatePwdTime = #{${_conditionParam_}.lastUpdatePwdTime}
</if>
<if test="conditionParamRef.lastUpdatePwdTime == null">
${_conditionType_} a.lastUpdatePwdTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('lastUpdatePwdTimeStart') and conditionParamRef.lastUpdatePwdTimeStart != null and conditionParamRef.lastUpdatePwdTimeStart!=''">
${_conditionType_} a.lastUpdatePwdTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastUpdatePwdTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('lastUpdatePwdTimeEnd') and conditionParamRef.lastUpdatePwdTimeEnd != null and conditionParamRef.lastUpdatePwdTimeEnd!=''">
${_conditionType_} a.lastUpdatePwdTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastUpdatePwdTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('errorCount')">
<if test="conditionParamRef.errorCount != null ">
${_conditionType_} a.errorCount = #{${_conditionParam_}.errorCount}
</if>
<if test="conditionParamRef.errorCount == null">
${_conditionType_} a.errorCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('errorCountList')">
${_conditionType_} a.errorCount in
<foreach collection="conditionParamRef.errorCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('errorCountNotList')">
${_conditionType_} a.errorCount not in
<foreach collection="conditionParamRef.errorCountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('errorCountStart') and conditionParamRef.errorCountStart != null">
${_conditionType_} a.errorCount <![CDATA[ >= ]]> #{${_conditionParam_}.errorCountStart}
</if>
<if test="conditionParamRef.containsKey('errorCountEnd') and conditionParamRef.errorCountEnd != null">
${_conditionType_} a.errorCount <![CDATA[ <= ]]> #{${_conditionParam_}.errorCountEnd}
</if>
<if test="conditionParamRef.containsKey('loginLock')">
<if test="conditionParamRef.loginLock != null ">
${_conditionType_} a.loginLock = #{${_conditionParam_}.loginLock}
</if>
<if test="conditionParamRef.loginLock == null">
${_conditionType_} a.loginLock is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginLockList')">
${_conditionType_} a.loginLock in
<foreach collection="conditionParamRef.loginLockList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginLockNotList')">
${_conditionType_} a.loginLock not in
<foreach collection="conditionParamRef.loginLockNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginLockStart') and conditionParamRef.loginLockStart != null">
${_conditionType_} a.loginLock <![CDATA[ >= ]]> #{${_conditionParam_}.loginLockStart}
</if>
<if test="conditionParamRef.containsKey('loginLockEnd') and conditionParamRef.loginLockEnd != null">
${_conditionType_} a.loginLock <![CDATA[ <= ]]> #{${_conditionParam_}.loginLockEnd}
</if>
<if test="conditionParamRef.containsKey('lockTime')">
<if test="conditionParamRef.lockTime != null ">
${_conditionType_} a.lockTime = #{${_conditionParam_}.lockTime}
</if>
<if test="conditionParamRef.lockTime == null">
${_conditionType_} a.lockTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('lockTimeStart') and conditionParamRef.lockTimeStart != null and conditionParamRef.lockTimeStart!=''">
${_conditionType_} a.lockTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lockTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('lockTimeEnd') and conditionParamRef.lockTimeEnd != null and conditionParamRef.lockTimeEnd!=''">
${_conditionType_} a.lockTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lockTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1029,6 +1219,31 @@ ...@@ -1029,6 +1219,31 @@
<if test='orderCol.lastModPwdAddr != null and "DESC".equalsIgnoreCase(orderCol.lastModPwdAddr)'>DESC</if> <if test='orderCol.lastModPwdAddr != null and "DESC".equalsIgnoreCase(orderCol.lastModPwdAddr)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('saltKey')">
a.saltKey
<if test='orderCol.saltKey != null and "DESC".equalsIgnoreCase(orderCol.saltKey)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('lastUpdatePwdTime')">
a.lastUpdatePwdTime
<if test='orderCol.lastUpdatePwdTime != null and "DESC".equalsIgnoreCase(orderCol.lastUpdatePwdTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('errorCount')">
a.errorCount
<if test='orderCol.errorCount != null and "DESC".equalsIgnoreCase(orderCol.errorCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginLock')">
a.loginLock
<if test='orderCol.loginLock != null and "DESC".equalsIgnoreCase(orderCol.loginLock)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('lockTime')">
a.lockTime
<if test='orderCol.lockTime != null and "DESC".equalsIgnoreCase(orderCol.lockTime)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
datav-manager/src/main/resources/sqlmap/module/customer/CustomerMapper.xml
View file @ b516bd52
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="lastLoginTime" column="lastLoginTime" /> <result property="lastLoginTime" column="lastLoginTime" />
<result property="lastLoginAddress" column="lastLoginAddress" /> <result property="lastLoginAddress" column="lastLoginAddress" />
<result property="openId" column="openId" />
<result property="saltKey" column="saltKey" />
<result property="lastUpdatePwdTime" column="lastUpdatePwdTime" />
<result property="errorCount" column="errorCount" />
<result property="loginLock" column="loginLock" />
<result property="lockTime" column="lockTime" />
</resultMap> </resultMap>
...@@ -92,23 +98,41 @@ ...@@ -92,23 +98,41 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastLoginAddress') or colPickMode == 1 and data.containsKey('lastLoginAddress')))">
a.lastLoginAddress, a.lastLoginAddress,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('openId') or colPickMode == 1 and data.containsKey('openId')))">
a.openId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('saltKey') or colPickMode == 1 and data.containsKey('saltKey')))">
a.saltKey,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lastUpdatePwdTime') or colPickMode == 1 and data.containsKey('lastUpdatePwdTime')))">
a.lastUpdatePwdTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('errorCount') or colPickMode == 1 and data.containsKey('errorCount')))">
a.errorCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginLock') or colPickMode == 1 and data.containsKey('loginLock')))">
a.loginLock,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('lockTime') or colPickMode == 1 and data.containsKey('lockTime')))">
a.lockTime,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CustomerEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CustomerEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_customer insert into mortals_xhx_customer
(loginName,password,memberLevel,custName,organization,contactTelphone,enterpriseConsultant,siteId,sex,mailbox,job,avatar,customerSrc,status,createUserId,createTime,updateTime,lastLoginTime,lastLoginAddress) (loginName,password,memberLevel,custName,organization,contactTelphone,enterpriseConsultant,siteId,sex,mailbox,job,avatar,customerSrc,status,createUserId,createTime,updateTime,lastLoginTime,lastLoginAddress,openId,saltKey,lastUpdatePwdTime,errorCount,loginLock,lockTime)
VALUES VALUES
(#{loginName},#{password},#{memberLevel},#{custName},#{organization},#{contactTelphone},#{enterpriseConsultant},#{siteId},#{sex},#{mailbox},#{job},#{avatar},#{customerSrc},#{status},#{createUserId},#{createTime},#{updateTime},#{lastLoginTime},#{lastLoginAddress}) (#{loginName},#{password},#{memberLevel},#{custName},#{organization},#{contactTelphone},#{enterpriseConsultant},#{siteId},#{sex},#{mailbox},#{job},#{avatar},#{customerSrc},#{status},#{createUserId},#{createTime},#{updateTime},#{lastLoginTime},#{lastLoginAddress},#{openId},#{saltKey},#{lastUpdatePwdTime},#{errorCount},#{loginLock},#{lockTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_customer insert into mortals_xhx_customer
(loginName,password,memberLevel,custName,organization,contactTelphone,enterpriseConsultant,siteId,sex,mailbox,job,avatar,customerSrc,status,createUserId,createTime,updateTime,lastLoginTime,lastLoginAddress) (loginName,password,memberLevel,custName,organization,contactTelphone,enterpriseConsultant,siteId,sex,mailbox,job,avatar,customerSrc,status,createUserId,createTime,updateTime,lastLoginTime,lastLoginAddress,openId,saltKey,lastUpdatePwdTime,errorCount,loginLock,lockTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.loginName},#{item.password},#{item.memberLevel},#{item.custName},#{item.organization},#{item.contactTelphone},#{item.enterpriseConsultant},#{item.siteId},#{item.sex},#{item.mailbox},#{item.job},#{item.avatar},#{item.customerSrc},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateTime},#{item.lastLoginTime},#{item.lastLoginAddress}) (#{item.loginName},#{item.password},#{item.memberLevel},#{item.custName},#{item.organization},#{item.contactTelphone},#{item.enterpriseConsultant},#{item.siteId},#{item.sex},#{item.mailbox},#{item.job},#{item.avatar},#{item.customerSrc},#{item.status},#{item.createUserId},#{item.createTime},#{item.updateTime},#{item.lastLoginTime},#{item.lastLoginAddress},#{item.openId},#{item.saltKey},#{item.lastUpdatePwdTime},#{item.errorCount},#{item.loginLock},#{item.lockTime})
</foreach> </foreach>
</insert> </insert>
...@@ -193,6 +217,30 @@ ...@@ -193,6 +217,30 @@
<if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))"> <if test="(colPickMode==0 and data.containsKey('lastLoginAddress')) or (colPickMode==1 and !data.containsKey('lastLoginAddress'))">
a.lastLoginAddress=#{data.lastLoginAddress}, a.lastLoginAddress=#{data.lastLoginAddress},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('openId')) or (colPickMode==1 and !data.containsKey('openId'))">
a.openId=#{data.openId},
</if>
<if test="(colPickMode==0 and data.containsKey('saltKey')) or (colPickMode==1 and !data.containsKey('saltKey'))">
a.saltKey=#{data.saltKey},
</if>
<if test="(colPickMode==0 and data.containsKey('lastUpdatePwdTime')) or (colPickMode==1 and !data.containsKey('lastUpdatePwdTime'))">
a.lastUpdatePwdTime=#{data.lastUpdatePwdTime},
</if>
<if test="(colPickMode==0 and data.containsKey('errorCount')) or (colPickMode==1 and !data.containsKey('errorCount'))">
a.errorCount=#{data.errorCount},
</if>
<if test="(colPickMode==0 and data.containsKey('errorCountIncrement')) or (colPickMode==1 and !data.containsKey('errorCountIncrement'))">
a.errorCount=ifnull(a.errorCount,0) + #{data.errorCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('loginLock')) or (colPickMode==1 and !data.containsKey('loginLock'))">
a.loginLock=#{data.loginLock},
</if>
<if test="(colPickMode==0 and data.containsKey('loginLockIncrement')) or (colPickMode==1 and !data.containsKey('loginLockIncrement'))">
a.loginLock=ifnull(a.loginLock,0) + #{data.loginLockIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('lockTime')) or (colPickMode==1 and !data.containsKey('lockTime'))">
a.lockTime=#{data.lockTime},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -368,6 +416,58 @@ ...@@ -368,6 +416,58 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="openId=(case" suffix="ELSE openId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('openId')) or (colPickMode==1 and !item.containsKey('openId'))">
when a.id=#{item.id} then #{item.openId}
</if>
</foreach>
</trim>
<trim prefix="saltKey=(case" suffix="ELSE saltKey end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('saltKey')) or (colPickMode==1 and !item.containsKey('saltKey'))">
when a.id=#{item.id} then #{item.saltKey}
</if>
</foreach>
</trim>
<trim prefix="lastUpdatePwdTime=(case" suffix="ELSE lastUpdatePwdTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('lastUpdatePwdTime')) or (colPickMode==1 and !item.containsKey('lastUpdatePwdTime'))">
when a.id=#{item.id} then #{item.lastUpdatePwdTime}
</if>
</foreach>
</trim>
<trim prefix="errorCount=(case" suffix="ELSE errorCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('errorCount')) or (colPickMode==1 and !item.containsKey('errorCount'))">
when a.id=#{item.id} then #{item.errorCount}
</when>
<when test="(colPickMode==0 and item.containsKey('errorCountIncrement')) or (colPickMode==1 and !item.containsKey('errorCountIncrement'))">
when a.id=#{item.id} then ifnull(a.errorCount,0) + #{item.errorCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="loginLock=(case" suffix="ELSE loginLock end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('loginLock')) or (colPickMode==1 and !item.containsKey('loginLock'))">
when a.id=#{item.id} then #{item.loginLock}
</when>
<when test="(colPickMode==0 and item.containsKey('loginLockIncrement')) or (colPickMode==1 and !item.containsKey('loginLockIncrement'))">
when a.id=#{item.id} then ifnull(a.loginLock,0) + #{item.loginLockIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="lockTime=(case" suffix="ELSE lockTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('lockTime')) or (colPickMode==1 and !item.containsKey('lockTime'))">
when a.id=#{item.id} then #{item.lockTime}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -391,6 +491,21 @@ ...@@ -391,6 +491,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_customer where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_customer where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_customer as a delete a.* from mortals_xhx_customer as a
...@@ -477,12 +592,18 @@ ...@@ -477,12 +592,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -499,12 +620,18 @@ ...@@ -499,12 +620,18 @@
${_conditionType_} a.loginName is null ${_conditionType_} a.loginName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('loginNameList')"> <if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in ${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('password')"> <if test="conditionParamRef.containsKey('password')">
<if test="conditionParamRef.password != null and conditionParamRef.password != ''"> <if test="conditionParamRef.password != null and conditionParamRef.password != ''">
...@@ -514,12 +641,18 @@ ...@@ -514,12 +641,18 @@
${_conditionType_} a.password is null ${_conditionType_} a.password is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('passwordList')"> <if test="conditionParamRef.containsKey('passwordList') and conditionParamRef.passwordList.size() > 0">
${_conditionType_} a.password in ${_conditionType_} a.password in
<foreach collection="conditionParamRef.passwordList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.passwordList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('passwordNotList') and conditionParamRef.passwordNotList.size() > 0">
${_conditionType_} a.password not in
<foreach collection="conditionParamRef.passwordNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('memberLevel')"> <if test="conditionParamRef.containsKey('memberLevel')">
<if test="conditionParamRef.memberLevel != null "> <if test="conditionParamRef.memberLevel != null ">
${_conditionType_} a.memberLevel = #{${_conditionParam_}.memberLevel} ${_conditionType_} a.memberLevel = #{${_conditionParam_}.memberLevel}
...@@ -528,12 +661,18 @@ ...@@ -528,12 +661,18 @@
${_conditionType_} a.memberLevel is null ${_conditionType_} a.memberLevel is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('memberLevelList')"> <if test="conditionParamRef.containsKey('memberLevelList') and conditionParamRef.memberLevelList.size() > 0">
${_conditionType_} a.memberLevel in ${_conditionType_} a.memberLevel in
<foreach collection="conditionParamRef.memberLevelList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.memberLevelList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('memberLevelNotList') and conditionParamRef.memberLevelNotList.size() > 0">
${_conditionType_} a.memberLevel not in
<foreach collection="conditionParamRef.memberLevelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('memberLevelStart') and conditionParamRef.memberLevelStart != null"> <if test="conditionParamRef.containsKey('memberLevelStart') and conditionParamRef.memberLevelStart != null">
${_conditionType_} a.memberLevel <![CDATA[ >= ]]> #{${_conditionParam_}.memberLevelStart} ${_conditionType_} a.memberLevel <![CDATA[ >= ]]> #{${_conditionParam_}.memberLevelStart}
</if> </if>
...@@ -550,12 +689,18 @@ ...@@ -550,12 +689,18 @@
${_conditionType_} a.custName is null ${_conditionType_} a.custName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('custNameList')"> <if test="conditionParamRef.containsKey('custNameList') and conditionParamRef.custNameList.size() > 0">
${_conditionType_} a.custName in ${_conditionType_} a.custName in
<foreach collection="conditionParamRef.custNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.custNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('custNameNotList') and conditionParamRef.custNameNotList.size() > 0">
${_conditionType_} a.custName not in
<foreach collection="conditionParamRef.custNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('organization')"> <if test="conditionParamRef.containsKey('organization')">
<if test="conditionParamRef.organization != null and conditionParamRef.organization != ''"> <if test="conditionParamRef.organization != null and conditionParamRef.organization != ''">
...@@ -565,12 +710,18 @@ ...@@ -565,12 +710,18 @@
${_conditionType_} a.organization is null ${_conditionType_} a.organization is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('organizationList')"> <if test="conditionParamRef.containsKey('organizationList') and conditionParamRef.organizationList.size() > 0">
${_conditionType_} a.organization in ${_conditionType_} a.organization in
<foreach collection="conditionParamRef.organizationList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.organizationList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('organizationNotList') and conditionParamRef.organizationNotList.size() > 0">
${_conditionType_} a.organization not in
<foreach collection="conditionParamRef.organizationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('contactTelphone')"> <if test="conditionParamRef.containsKey('contactTelphone')">
<if test="conditionParamRef.contactTelphone != null and conditionParamRef.contactTelphone != ''"> <if test="conditionParamRef.contactTelphone != null and conditionParamRef.contactTelphone != ''">
...@@ -580,12 +731,18 @@ ...@@ -580,12 +731,18 @@
${_conditionType_} a.contactTelphone is null ${_conditionType_} a.contactTelphone is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('contactTelphoneList')"> <if test="conditionParamRef.containsKey('contactTelphoneList') and conditionParamRef.contactTelphoneList.size() > 0">
${_conditionType_} a.contactTelphone in ${_conditionType_} a.contactTelphone in
<foreach collection="conditionParamRef.contactTelphoneList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.contactTelphoneList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('contactTelphoneNotList') and conditionParamRef.contactTelphoneNotList.size() > 0">
${_conditionType_} a.contactTelphone not in
<foreach collection="conditionParamRef.contactTelphoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('enterpriseConsultant')"> <if test="conditionParamRef.containsKey('enterpriseConsultant')">
<if test="conditionParamRef.enterpriseConsultant != null and conditionParamRef.enterpriseConsultant != ''"> <if test="conditionParamRef.enterpriseConsultant != null and conditionParamRef.enterpriseConsultant != ''">
...@@ -595,12 +752,18 @@ ...@@ -595,12 +752,18 @@
${_conditionType_} a.enterpriseConsultant is null ${_conditionType_} a.enterpriseConsultant is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseConsultantList')"> <if test="conditionParamRef.containsKey('enterpriseConsultantList') and conditionParamRef.enterpriseConsultantList.size() > 0">
${_conditionType_} a.enterpriseConsultant in ${_conditionType_} a.enterpriseConsultant in
<foreach collection="conditionParamRef.enterpriseConsultantList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enterpriseConsultantList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('enterpriseConsultantNotList') and conditionParamRef.enterpriseConsultantNotList.size() > 0">
${_conditionType_} a.enterpriseConsultant not in
<foreach collection="conditionParamRef.enterpriseConsultantNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteId')"> <if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null "> <if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId} ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
...@@ -609,12 +772,18 @@ ...@@ -609,12 +772,18 @@
${_conditionType_} a.siteId is null ${_conditionType_} a.siteId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList')"> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in ${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null"> <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart} ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if> </if>
...@@ -630,12 +799,18 @@ ...@@ -630,12 +799,18 @@
${_conditionType_} a.sex is null ${_conditionType_} a.sex is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sexList')"> <if test="conditionParamRef.containsKey('sexList') and conditionParamRef.sexList.size() > 0">
${_conditionType_} a.sex in ${_conditionType_} a.sex in
<foreach collection="conditionParamRef.sexList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sexList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sexNotList') and conditionParamRef.sexNotList.size() > 0">
${_conditionType_} a.sex not in
<foreach collection="conditionParamRef.sexNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sexStart') and conditionParamRef.sexStart != null"> <if test="conditionParamRef.containsKey('sexStart') and conditionParamRef.sexStart != null">
${_conditionType_} a.sex <![CDATA[ >= ]]> #{${_conditionParam_}.sexStart} ${_conditionType_} a.sex <![CDATA[ >= ]]> #{${_conditionParam_}.sexStart}
</if> </if>
...@@ -652,12 +827,18 @@ ...@@ -652,12 +827,18 @@
${_conditionType_} a.mailbox is null ${_conditionType_} a.mailbox is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('mailboxList')"> <if test="conditionParamRef.containsKey('mailboxList') and conditionParamRef.mailboxList.size() > 0">
${_conditionType_} a.mailbox in ${_conditionType_} a.mailbox in
<foreach collection="conditionParamRef.mailboxList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.mailboxList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('mailboxNotList') and conditionParamRef.mailboxNotList.size() > 0">
${_conditionType_} a.mailbox not in
<foreach collection="conditionParamRef.mailboxNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('job')"> <if test="conditionParamRef.containsKey('job')">
<if test="conditionParamRef.job != null and conditionParamRef.job != ''"> <if test="conditionParamRef.job != null and conditionParamRef.job != ''">
...@@ -667,12 +848,18 @@ ...@@ -667,12 +848,18 @@
${_conditionType_} a.job is null ${_conditionType_} a.job is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('jobList')"> <if test="conditionParamRef.containsKey('jobList') and conditionParamRef.jobList.size() > 0">
${_conditionType_} a.job in ${_conditionType_} a.job in
<foreach collection="conditionParamRef.jobList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.jobList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('jobNotList') and conditionParamRef.jobNotList.size() > 0">
${_conditionType_} a.job not in
<foreach collection="conditionParamRef.jobNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('avatar')"> <if test="conditionParamRef.containsKey('avatar')">
<if test="conditionParamRef.avatar != null and conditionParamRef.avatar != ''"> <if test="conditionParamRef.avatar != null and conditionParamRef.avatar != ''">
...@@ -682,12 +869,18 @@ ...@@ -682,12 +869,18 @@
${_conditionType_} a.avatar is null ${_conditionType_} a.avatar is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('avatarList')"> <if test="conditionParamRef.containsKey('avatarList') and conditionParamRef.avatarList.size() > 0">
${_conditionType_} a.avatar in ${_conditionType_} a.avatar in
<foreach collection="conditionParamRef.avatarList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.avatarList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('avatarNotList') and conditionParamRef.avatarNotList.size() > 0">
${_conditionType_} a.avatar not in
<foreach collection="conditionParamRef.avatarNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerSrc')"> <if test="conditionParamRef.containsKey('customerSrc')">
<if test="conditionParamRef.customerSrc != null "> <if test="conditionParamRef.customerSrc != null ">
${_conditionType_} a.customerSrc = #{${_conditionParam_}.customerSrc} ${_conditionType_} a.customerSrc = #{${_conditionParam_}.customerSrc}
...@@ -696,12 +889,18 @@ ...@@ -696,12 +889,18 @@
${_conditionType_} a.customerSrc is null ${_conditionType_} a.customerSrc is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('customerSrcList')"> <if test="conditionParamRef.containsKey('customerSrcList') and conditionParamRef.customerSrcList.size() > 0">
${_conditionType_} a.customerSrc in ${_conditionType_} a.customerSrc in
<foreach collection="conditionParamRef.customerSrcList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.customerSrcList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('customerSrcNotList') and conditionParamRef.customerSrcNotList.size() > 0">
${_conditionType_} a.customerSrc not in
<foreach collection="conditionParamRef.customerSrcNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerSrcStart') and conditionParamRef.customerSrcStart != null"> <if test="conditionParamRef.containsKey('customerSrcStart') and conditionParamRef.customerSrcStart != null">
${_conditionType_} a.customerSrc <![CDATA[ >= ]]> #{${_conditionParam_}.customerSrcStart} ${_conditionType_} a.customerSrc <![CDATA[ >= ]]> #{${_conditionParam_}.customerSrcStart}
</if> </if>
...@@ -717,12 +916,18 @@ ...@@ -717,12 +916,18 @@
${_conditionType_} a.status is null ${_conditionType_} a.status is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('statusList')"> <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
${_conditionType_} a.status in ${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
${_conditionType_} a.status not in
<foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> <if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} ${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if> </if>
...@@ -738,12 +943,18 @@ ...@@ -738,12 +943,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -805,12 +1016,143 @@ ...@@ -805,12 +1016,143 @@
${_conditionType_} a.lastLoginAddress is null ${_conditionType_} a.lastLoginAddress is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('lastLoginAddressList')"> <if test="conditionParamRef.containsKey('lastLoginAddressList') and conditionParamRef.lastLoginAddressList.size() > 0">
${_conditionType_} a.lastLoginAddress in ${_conditionType_} a.lastLoginAddress in
<foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lastLoginAddressList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('lastLoginAddressNotList') and conditionParamRef.lastLoginAddressNotList.size() > 0">
${_conditionType_} a.lastLoginAddress not in
<foreach collection="conditionParamRef.lastLoginAddressNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('openId')">
<if test="conditionParamRef.openId != null and conditionParamRef.openId != ''">
${_conditionType_} a.openId like #{${_conditionParam_}.openId}
</if>
<if test="conditionParamRef.openId == null">
${_conditionType_} a.openId is null
</if>
</if>
<if test="conditionParamRef.containsKey('openIdList') and conditionParamRef.openIdList.size() > 0">
${_conditionType_} a.openId in
<foreach collection="conditionParamRef.openIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('openIdNotList') and conditionParamRef.openIdNotList.size() > 0">
${_conditionType_} a.openId not in
<foreach collection="conditionParamRef.openIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('saltKey')">
<if test="conditionParamRef.saltKey != null and conditionParamRef.saltKey != ''">
${_conditionType_} a.saltKey like #{${_conditionParam_}.saltKey}
</if>
<if test="conditionParamRef.saltKey == null">
${_conditionType_} a.saltKey is null
</if>
</if>
<if test="conditionParamRef.containsKey('saltKeyList')">
${_conditionType_} a.saltKey in
<foreach collection="conditionParamRef.saltKeyList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('saltKeyNotList')">
${_conditionType_} a.saltKey not in
<foreach collection="conditionParamRef.saltKeyNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('lastUpdatePwdTime')">
<if test="conditionParamRef.lastUpdatePwdTime != null ">
${_conditionType_} a.lastUpdatePwdTime = #{${_conditionParam_}.lastUpdatePwdTime}
</if>
<if test="conditionParamRef.lastUpdatePwdTime == null">
${_conditionType_} a.lastUpdatePwdTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('lastUpdatePwdTimeStart') and conditionParamRef.lastUpdatePwdTimeStart != null and conditionParamRef.lastUpdatePwdTimeStart!=''">
${_conditionType_} a.lastUpdatePwdTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastUpdatePwdTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('lastUpdatePwdTimeEnd') and conditionParamRef.lastUpdatePwdTimeEnd != null and conditionParamRef.lastUpdatePwdTimeEnd!=''">
${_conditionType_} a.lastUpdatePwdTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lastUpdatePwdTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('errorCount')">
<if test="conditionParamRef.errorCount != null ">
${_conditionType_} a.errorCount = #{${_conditionParam_}.errorCount}
</if>
<if test="conditionParamRef.errorCount == null">
${_conditionType_} a.errorCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('errorCountList')">
${_conditionType_} a.errorCount in
<foreach collection="conditionParamRef.errorCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('errorCountNotList')">
${_conditionType_} a.errorCount not in
<foreach collection="conditionParamRef.errorCountNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('errorCountStart') and conditionParamRef.errorCountStart != null">
${_conditionType_} a.errorCount <![CDATA[ >= ]]> #{${_conditionParam_}.errorCountStart}
</if>
<if test="conditionParamRef.containsKey('errorCountEnd') and conditionParamRef.errorCountEnd != null">
${_conditionType_} a.errorCount <![CDATA[ <= ]]> #{${_conditionParam_}.errorCountEnd}
</if>
<if test="conditionParamRef.containsKey('loginLock')">
<if test="conditionParamRef.loginLock != null ">
${_conditionType_} a.loginLock = #{${_conditionParam_}.loginLock}
</if>
<if test="conditionParamRef.loginLock == null">
${_conditionType_} a.loginLock is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginLockList')">
${_conditionType_} a.loginLock in
<foreach collection="conditionParamRef.loginLockList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginLockNotList')">
${_conditionType_} a.loginLock not in
<foreach collection="conditionParamRef.loginLockNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginLockStart') and conditionParamRef.loginLockStart != null">
${_conditionType_} a.loginLock <![CDATA[ >= ]]> #{${_conditionParam_}.loginLockStart}
</if>
<if test="conditionParamRef.containsKey('loginLockEnd') and conditionParamRef.loginLockEnd != null">
${_conditionType_} a.loginLock <![CDATA[ <= ]]> #{${_conditionParam_}.loginLockEnd}
</if>
<if test="conditionParamRef.containsKey('lockTime')">
<if test="conditionParamRef.lockTime != null ">
${_conditionType_} a.lockTime = #{${_conditionParam_}.lockTime}
</if>
<if test="conditionParamRef.lockTime == null">
${_conditionType_} a.lockTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('lockTimeStart') and conditionParamRef.lockTimeStart != null and conditionParamRef.lockTimeStart!=''">
${_conditionType_} a.lockTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lockTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('lockTimeEnd') and conditionParamRef.lockTimeEnd != null and conditionParamRef.lockTimeEnd!=''">
${_conditionType_} a.lockTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.lockTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -924,6 +1266,36 @@ ...@@ -924,6 +1266,36 @@
<if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if> <if test='orderCol.lastLoginAddress != null and "DESC".equalsIgnoreCase(orderCol.lastLoginAddress)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('openId')">
a.openId
<if test='orderCol.openId != null and "DESC".equalsIgnoreCase(orderCol.openId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('saltKey')">
a.saltKey
<if test='orderCol.saltKey != null and "DESC".equalsIgnoreCase(orderCol.saltKey)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('lastUpdatePwdTime')">
a.lastUpdatePwdTime
<if test='orderCol.lastUpdatePwdTime != null and "DESC".equalsIgnoreCase(orderCol.lastUpdatePwdTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('errorCount')">
a.errorCount
<if test='orderCol.errorCount != null and "DESC".equalsIgnoreCase(orderCol.errorCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginLock')">
a.loginLock
<if test='orderCol.loginLock != null and "DESC".equalsIgnoreCase(orderCol.loginLock)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('lockTime')">
a.lockTime
<if test='orderCol.lockTime != null and "DESC".equalsIgnoreCase(orderCol.lockTime)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
datav-manager/src/main/resources/sqlmap/module/customer/CustomerMapperExt.xml
View file @ b516bd52
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="lastLoginTime" column="lastLoginTime" /> <result property="lastLoginTime" column="lastLoginTime" />
<result property="lastLoginAddress" column="lastLoginAddress" /> <result property="lastLoginAddress" column="lastLoginAddress" />
<result property="openId" column="openId" />
<result property="customerDesignPictures" column="customerDesignPictures" /> <result property="customerDesignPictures" column="customerDesignPictures" />
<result property="customerDesignVideos" column="customerDesignVideos" /> <result property="customerDesignVideos" column="customerDesignVideos" />
</resultMap> </resultMap>
...@@ -67,4 +68,23 @@ ...@@ -67,4 +68,23 @@
</trim> </trim>
</select> </select>
<!-- 用户统计 -->
<select id="getCensus" parameterType="paramDto" resultType="com.mortals.xhx.module.customer.model.vo.CustomerCensusVo">
SELECT
memberLevel,
count(id) AS customerCount
FROM
mortals_xhx_customer t
GROUP BY
t.memberLevel
</select>
<!-- 用户统计 -->
<select id="getDesignCensus" parameterType="paramDto" resultType="com.mortals.xhx.module.customer.model.vo.CustomerDesignCensusVo">
SELECT
sum(customerDesignPictures) AS picturesCount,
sum(customerDesignVideos) AS videosCount
FROM
mortals_xhx_customer_work_design_stat
</select>
</mapper> </mapper>
\ No newline at end of file
datav-manager/src/main/resources/sqlmap/module/customer/CustomerPwdRecordMapper.xml 0 → 100644
View file @ b516bd52
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.customer.dao.ibatis.CustomerPwdRecordDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="CustomerPwdRecordEntity" id="CustomerPwdRecordEntity-Map">
<id property="id" column="id" />
<result property="userId" column="userId" />
<result property="loginName" column="loginName" />
<result property="loginPwd" column="loginPwd" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))">
a.userId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginName') or colPickMode == 1 and data.containsKey('loginName')))">
a.loginName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('loginPwd') or colPickMode == 1 and data.containsKey('loginPwd')))">
a.loginPwd,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CustomerPwdRecordEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_customer_pwd_record
(userId,loginName,loginPwd,createTime,createUserId)
VALUES
(#{userId},#{loginName},#{loginPwd},#{createTime},#{createUserId})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_customer_pwd_record
(userId,loginName,loginPwd,createTime,createUserId)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.userId},#{item.loginName},#{item.loginPwd},#{item.createTime},#{item.createUserId})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_customer_pwd_record as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('userId')) or (colPickMode==1 and !data.containsKey('userId'))">
a.userId=#{data.userId},
</if>
<if test="(colPickMode==0 and data.containsKey('userIdIncrement')) or (colPickMode==1 and !data.containsKey('userIdIncrement'))">
a.userId=ifnull(a.userId,0) + #{data.userIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('loginName')) or (colPickMode==1 and !data.containsKey('loginName'))">
a.loginName=#{data.loginName},
</if>
<if test="(colPickMode==0 and data.containsKey('loginPwd')) or (colPickMode==1 and !data.containsKey('loginPwd'))">
a.loginPwd=#{data.loginPwd},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_customer_pwd_record as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="userId=(case" suffix="ELSE userId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('userId')) or (colPickMode==1 and !item.containsKey('userId'))">
when a.id=#{item.id} then #{item.userId}
</when>
<when test="(colPickMode==0 and item.containsKey('userIdIncrement')) or (colPickMode==1 and !item.containsKey('userIdIncrement'))">
when a.id=#{item.id} then ifnull(a.userId,0) + #{item.userIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="loginName=(case" suffix="ELSE loginName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginName')) or (colPickMode==1 and !item.containsKey('loginName'))">
when a.id=#{item.id} then #{item.loginName}
</if>
</foreach>
</trim>
<trim prefix="loginPwd=(case" suffix="ELSE loginPwd end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('loginPwd')) or (colPickMode==1 and !item.containsKey('loginPwd'))">
when a.id=#{item.id} then #{item.loginPwd}
</if>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="CustomerPwdRecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_customer_pwd_record as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_customer_pwd_record as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_customer_pwd_record where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_customer_pwd_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_customer_pwd_record where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_customer_pwd_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="CustomerPwdRecordEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_customer_pwd_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_customer_pwd_record as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('userId')">
<if test="conditionParamRef.userId != null ">
${_conditionType_} a.userId = #{${_conditionParam_}.userId}
</if>
<if test="conditionParamRef.userId == null">
${_conditionType_} a.userId is null
</if>
</if>
<if test="conditionParamRef.containsKey('userIdList') and conditionParamRef.userIdList.size() > 0">
${_conditionType_} a.userId in
<foreach collection="conditionParamRef.userIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userIdNotList') and conditionParamRef.userIdNotList.size() > 0">
${_conditionType_} a.userId not in
<foreach collection="conditionParamRef.userIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userIdStart') and conditionParamRef.userIdStart != null">
${_conditionType_} a.userId <![CDATA[ >= ]]> #{${_conditionParam_}.userIdStart}
</if>
<if test="conditionParamRef.containsKey('userIdEnd') and conditionParamRef.userIdEnd != null">
${_conditionType_} a.userId <![CDATA[ <= ]]> #{${_conditionParam_}.userIdEnd}
</if>
<if test="conditionParamRef.containsKey('loginName')">
<if test="conditionParamRef.loginName != null and conditionParamRef.loginName != ''">
${_conditionType_} a.loginName like #{${_conditionParam_}.loginName}
</if>
<if test="conditionParamRef.loginName == null">
${_conditionType_} a.loginName is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginNameList') and conditionParamRef.loginNameList.size() > 0">
${_conditionType_} a.loginName in
<foreach collection="conditionParamRef.loginNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginNameNotList') and conditionParamRef.loginNameNotList.size() > 0">
${_conditionType_} a.loginName not in
<foreach collection="conditionParamRef.loginNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwd')">
<if test="conditionParamRef.loginPwd != null and conditionParamRef.loginPwd != ''">
${_conditionType_} a.loginPwd like #{${_conditionParam_}.loginPwd}
</if>
<if test="conditionParamRef.loginPwd == null">
${_conditionType_} a.loginPwd is null
</if>
</if>
<if test="conditionParamRef.containsKey('loginPwdList') and conditionParamRef.loginPwdList.size() > 0">
${_conditionType_} a.loginPwd in
<foreach collection="conditionParamRef.loginPwdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('loginPwdNotList') and conditionParamRef.loginPwdNotList.size() > 0">
${_conditionType_} a.loginPwd not in
<foreach collection="conditionParamRef.loginPwdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('userId')">
a.userId
<if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginName')">
a.loginName
<if test='orderCol.loginName != null and "DESC".equalsIgnoreCase(orderCol.loginName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('loginPwd')">
a.loginPwd
<if test='orderCol.loginPwd != null and "DESC".equalsIgnoreCase(orderCol.loginPwd)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')">
a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
datav-manager/src/main/resources/sqlmap/module/customer/CustomerWorkCollectMapper.xml
View file @ b516bd52
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.customer.dao.ibatis.CustomerWorkCollectDaoImpl"> <mapper namespace="com.mortals.xhx.module.customer.dao.ibatis.CustomerWorkCollectDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<result property="customerId" column="customerId" /> <result property="customerId" column="customerId" />
<result property="masterplateId" column="masterplateId" /> <result property="masterplateId" column="masterplateId" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="designType" column="designType" />
</resultMap> </resultMap>
...@@ -28,23 +29,26 @@ ...@@ -28,23 +29,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('designType') or colPickMode == 1 and data.containsKey('designType')))">
a.designType,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CustomerWorkCollectEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CustomerWorkCollectEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_customer_work_collect insert into mortals_xhx_customer_work_collect
(customerId,masterplateId,createTime) (customerId,masterplateId,createTime,designType)
VALUES VALUES
(#{customerId},#{masterplateId},#{createTime}) (#{customerId},#{masterplateId},#{createTime},#{designType})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_customer_work_collect insert into mortals_xhx_customer_work_collect
(customerId,masterplateId,createTime) (customerId,masterplateId,createTime,designType)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.customerId},#{item.masterplateId},#{item.createTime}) (#{item.customerId},#{item.masterplateId},#{item.createTime},#{item.designType})
</foreach> </foreach>
</insert> </insert>
...@@ -69,6 +73,12 @@ ...@@ -69,6 +73,12 @@
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('designType')) or (colPickMode==1 and !data.containsKey('designType'))">
a.designType=#{data.designType},
</if>
<if test="(colPickMode==0 and data.containsKey('designTypeIncrement')) or (colPickMode==1 and !data.containsKey('designTypeIncrement'))">
a.designType=ifnull(a.designType,0) + #{data.designTypeIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -112,6 +122,18 @@ ...@@ -112,6 +122,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="designType=(case" suffix="ELSE designType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('designType')) or (colPickMode==1 and !item.containsKey('designType'))">
when a.id=#{item.id} then #{item.designType}
</when>
<when test="(colPickMode==0 and item.containsKey('designTypeIncrement')) or (colPickMode==1 and !item.containsKey('designTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.designType,0) + #{item.designTypeIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -135,6 +157,21 @@ ...@@ -135,6 +157,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_customer_work_collect where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_customer_work_collect where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_customer_work_collect as a delete a.* from mortals_xhx_customer_work_collect as a
...@@ -221,12 +258,18 @@ ...@@ -221,12 +258,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -242,12 +285,18 @@ ...@@ -242,12 +285,18 @@
${_conditionType_} a.customerId is null ${_conditionType_} a.customerId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('customerIdList')"> <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
${_conditionType_} a.customerId in ${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
${_conditionType_} a.customerId not in
<foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null"> <if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart} ${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if> </if>
...@@ -269,6 +318,12 @@ ...@@ -269,6 +318,12 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateIdNotList') and conditionParamRef.masterplateIdNotList.size() > 0">
${_conditionType_} a.masterplateId not in
<foreach collection="conditionParamRef.masterplateIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('masterplateIdStart') and conditionParamRef.masterplateIdStart != null"> <if test="conditionParamRef.containsKey('masterplateIdStart') and conditionParamRef.masterplateIdStart != null">
${_conditionType_} a.masterplateId <![CDATA[ >= ]]> #{${_conditionParam_}.masterplateIdStart} ${_conditionType_} a.masterplateId <![CDATA[ >= ]]> #{${_conditionParam_}.masterplateIdStart}
</if> </if>
...@@ -291,6 +346,33 @@ ...@@ -291,6 +346,33 @@
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('designType')">
<if test="conditionParamRef.designType != null ">
${_conditionType_} a.designType = #{${_conditionParam_}.designType}
</if>
<if test="conditionParamRef.designType == null">
${_conditionType_} a.designType is null
</if>
</if>
<if test="conditionParamRef.containsKey('designTypeList') and conditionParamRef.designTypeList.size() > 0">
${_conditionType_} a.designType in
<foreach collection="conditionParamRef.designTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designTypeNotList') and conditionParamRef.designTypeNotList.size() > 0">
${_conditionType_} a.designType not in
<foreach collection="conditionParamRef.designTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designTypeStart') and conditionParamRef.designTypeStart != null">
${_conditionType_} a.designType <![CDATA[ >= ]]> #{${_conditionParam_}.designTypeStart}
</if>
<if test="conditionParamRef.containsKey('designTypeEnd') and conditionParamRef.designTypeEnd != null">
${_conditionType_} a.designType <![CDATA[ <= ]]> #{${_conditionParam_}.designTypeEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -324,6 +406,11 @@ ...@@ -324,6 +406,11 @@
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('designType')">
a.designType
<if test='orderCol.designType != null and "DESC".equalsIgnoreCase(orderCol.designType)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
datav-manager/src/main/resources/sqlmap/module/customer/CustomerWorkDesignMapper.xml
View file @ b516bd52
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<result property="fontIds" column="fontIds" /> <result property="fontIds" column="fontIds" />
<result property="previewUrl" column="previewUrl" /> <result property="previewUrl" column="previewUrl" />
<result property="draft" column="draft" /> <result property="draft" column="draft" />
<result property="designType" column="designType" />
</resultMap> </resultMap>
...@@ -64,23 +65,26 @@ ...@@ -64,23 +65,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('draft') or colPickMode == 1 and data.containsKey('draft')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('draft') or colPickMode == 1 and data.containsKey('draft')))">
a.draft, a.draft,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('designType') or colPickMode == 1 and data.containsKey('designType')))">
a.designType,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="CustomerWorkDesignEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="CustomerWorkDesignEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_customer_work_design insert into mortals_xhx_customer_work_design
(customerId,workDesignName,workDesignStatus,workDesignDesc,createTime,updateTime,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,previewUrl,draft) (customerId,workDesignName,workDesignStatus,workDesignDesc,createTime,updateTime,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,previewUrl,draft,designType)
VALUES VALUES
(#{customerId},#{workDesignName},#{workDesignStatus},#{workDesignDesc},#{createTime},#{updateTime},#{pictureIds},#{pictureSrcIds},#{pictureBackgroundIds},#{fontIds},#{previewUrl},#{draft}) (#{customerId},#{workDesignName},#{workDesignStatus},#{workDesignDesc},#{createTime},#{updateTime},#{pictureIds},#{pictureSrcIds},#{pictureBackgroundIds},#{fontIds},#{previewUrl},#{draft},#{designType})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_customer_work_design insert into mortals_xhx_customer_work_design
(customerId,workDesignName,workDesignStatus,workDesignDesc,createTime,updateTime,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,previewUrl,draft) (customerId,workDesignName,workDesignStatus,workDesignDesc,createTime,updateTime,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,previewUrl,draft,designType)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.customerId},#{item.workDesignName},#{item.workDesignStatus},#{item.workDesignDesc},#{item.createTime},#{item.updateTime},#{item.pictureIds},#{item.pictureSrcIds},#{item.pictureBackgroundIds},#{item.fontIds},#{item.previewUrl},#{item.draft}) (#{item.customerId},#{item.workDesignName},#{item.workDesignStatus},#{item.workDesignDesc},#{item.createTime},#{item.updateTime},#{item.pictureIds},#{item.pictureSrcIds},#{item.pictureBackgroundIds},#{item.fontIds},#{item.previewUrl},#{item.draft},#{item.designType})
</foreach> </foreach>
</insert> </insert>
...@@ -132,6 +136,12 @@ ...@@ -132,6 +136,12 @@
<if test="(colPickMode==0 and data.containsKey('draft')) or (colPickMode==1 and !data.containsKey('draft'))"> <if test="(colPickMode==0 and data.containsKey('draft')) or (colPickMode==1 and !data.containsKey('draft'))">
a.draft=#{data.draft}, a.draft=#{data.draft},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('designType')) or (colPickMode==1 and !data.containsKey('designType'))">
a.designType=#{data.designType},
</if>
<if test="(colPickMode==0 and data.containsKey('designTypeIncrement')) or (colPickMode==1 and !data.containsKey('designTypeIncrement'))">
a.designType=ifnull(a.designType,0) + #{data.designTypeIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -238,6 +248,18 @@ ...@@ -238,6 +248,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="designType=(case" suffix="ELSE designType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('designType')) or (colPickMode==1 and !item.containsKey('designType'))">
when a.id=#{item.id} then #{item.designType}
</when>
<when test="(colPickMode==0 and item.containsKey('designTypeIncrement')) or (colPickMode==1 and !item.containsKey('designTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.designType,0) + #{item.designTypeIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -261,6 +283,21 @@ ...@@ -261,6 +283,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_customer_work_design where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_customer_work_design where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_customer_work_design as a delete a.* from mortals_xhx_customer_work_design as a
...@@ -347,12 +384,18 @@ ...@@ -347,12 +384,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -368,12 +411,18 @@ ...@@ -368,12 +411,18 @@
${_conditionType_} a.customerId is null ${_conditionType_} a.customerId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('customerIdList')"> <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
${_conditionType_} a.customerId in ${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
${_conditionType_} a.customerId not in
<foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null"> <if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart} ${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if> </if>
...@@ -390,12 +439,18 @@ ...@@ -390,12 +439,18 @@
${_conditionType_} a.workDesignName is null ${_conditionType_} a.workDesignName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workDesignNameList')"> <if test="conditionParamRef.containsKey('workDesignNameList') and conditionParamRef.workDesignNameList.size() > 0">
${_conditionType_} a.workDesignName in ${_conditionType_} a.workDesignName in
<foreach collection="conditionParamRef.workDesignNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workDesignNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workDesignNameNotList') and conditionParamRef.workDesignNameNotList.size() > 0">
${_conditionType_} a.workDesignName not in
<foreach collection="conditionParamRef.workDesignNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workDesignStatus')"> <if test="conditionParamRef.containsKey('workDesignStatus')">
<if test="conditionParamRef.workDesignStatus != null "> <if test="conditionParamRef.workDesignStatus != null ">
${_conditionType_} a.workDesignStatus = #{${_conditionParam_}.workDesignStatus} ${_conditionType_} a.workDesignStatus = #{${_conditionParam_}.workDesignStatus}
...@@ -404,12 +459,18 @@ ...@@ -404,12 +459,18 @@
${_conditionType_} a.workDesignStatus is null ${_conditionType_} a.workDesignStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workDesignStatusList')"> <if test="conditionParamRef.containsKey('workDesignStatusList') and conditionParamRef.workDesignStatusList.size() > 0">
${_conditionType_} a.workDesignStatus in ${_conditionType_} a.workDesignStatus in
<foreach collection="conditionParamRef.workDesignStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workDesignStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workDesignStatusNotList') and conditionParamRef.workDesignStatusNotList.size() > 0">
${_conditionType_} a.workDesignStatus not in
<foreach collection="conditionParamRef.workDesignStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('workDesignStatusStart') and conditionParamRef.workDesignStatusStart != null"> <if test="conditionParamRef.containsKey('workDesignStatusStart') and conditionParamRef.workDesignStatusStart != null">
${_conditionType_} a.workDesignStatus <![CDATA[ >= ]]> #{${_conditionParam_}.workDesignStatusStart} ${_conditionType_} a.workDesignStatus <![CDATA[ >= ]]> #{${_conditionParam_}.workDesignStatusStart}
</if> </if>
...@@ -426,12 +487,18 @@ ...@@ -426,12 +487,18 @@
${_conditionType_} a.workDesignDesc is null ${_conditionType_} a.workDesignDesc is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('workDesignDescList')"> <if test="conditionParamRef.containsKey('workDesignDescList') and conditionParamRef.workDesignDescList.size() > 0">
${_conditionType_} a.workDesignDesc in ${_conditionType_} a.workDesignDesc in
<foreach collection="conditionParamRef.workDesignDescList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.workDesignDescList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('workDesignDescNotList') and conditionParamRef.workDesignDescNotList.size() > 0">
${_conditionType_} a.workDesignDesc not in
<foreach collection="conditionParamRef.workDesignDescNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -471,12 +538,18 @@ ...@@ -471,12 +538,18 @@
${_conditionType_} a.pictureIds is null ${_conditionType_} a.pictureIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pictureIdsList')"> <if test="conditionParamRef.containsKey('pictureIdsList') and conditionParamRef.pictureIdsList.size() > 0">
${_conditionType_} a.pictureIds in ${_conditionType_} a.pictureIds in
<foreach collection="conditionParamRef.pictureIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pictureIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pictureIdsNotList') and conditionParamRef.pictureIdsNotList.size() > 0">
${_conditionType_} a.pictureIds not in
<foreach collection="conditionParamRef.pictureIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pictureSrcIds')"> <if test="conditionParamRef.containsKey('pictureSrcIds')">
<if test="conditionParamRef.pictureSrcIds != null and conditionParamRef.pictureSrcIds != ''"> <if test="conditionParamRef.pictureSrcIds != null and conditionParamRef.pictureSrcIds != ''">
...@@ -486,12 +559,18 @@ ...@@ -486,12 +559,18 @@
${_conditionType_} a.pictureSrcIds is null ${_conditionType_} a.pictureSrcIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pictureSrcIdsList')"> <if test="conditionParamRef.containsKey('pictureSrcIdsList') and conditionParamRef.pictureSrcIdsList.size() > 0">
${_conditionType_} a.pictureSrcIds in ${_conditionType_} a.pictureSrcIds in
<foreach collection="conditionParamRef.pictureSrcIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pictureSrcIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pictureSrcIdsNotList') and conditionParamRef.pictureSrcIdsNotList.size() > 0">
${_conditionType_} a.pictureSrcIds not in
<foreach collection="conditionParamRef.pictureSrcIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pictureBackgroundIds')"> <if test="conditionParamRef.containsKey('pictureBackgroundIds')">
<if test="conditionParamRef.pictureBackgroundIds != null and conditionParamRef.pictureBackgroundIds != ''"> <if test="conditionParamRef.pictureBackgroundIds != null and conditionParamRef.pictureBackgroundIds != ''">
...@@ -501,12 +580,18 @@ ...@@ -501,12 +580,18 @@
${_conditionType_} a.pictureBackgroundIds is null ${_conditionType_} a.pictureBackgroundIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pictureBackgroundIdsList')"> <if test="conditionParamRef.containsKey('pictureBackgroundIdsList') and conditionParamRef.pictureBackgroundIdsList.size() > 0">
${_conditionType_} a.pictureBackgroundIds in ${_conditionType_} a.pictureBackgroundIds in
<foreach collection="conditionParamRef.pictureBackgroundIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pictureBackgroundIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pictureBackgroundIdsNotList') and conditionParamRef.pictureBackgroundIdsNotList.size() > 0">
${_conditionType_} a.pictureBackgroundIds not in
<foreach collection="conditionParamRef.pictureBackgroundIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fontIds')"> <if test="conditionParamRef.containsKey('fontIds')">
<if test="conditionParamRef.fontIds != null and conditionParamRef.fontIds != ''"> <if test="conditionParamRef.fontIds != null and conditionParamRef.fontIds != ''">
...@@ -516,12 +601,18 @@ ...@@ -516,12 +601,18 @@
${_conditionType_} a.fontIds is null ${_conditionType_} a.fontIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fontIdsList')"> <if test="conditionParamRef.containsKey('fontIdsList') and conditionParamRef.fontIdsList.size() > 0">
${_conditionType_} a.fontIds in ${_conditionType_} a.fontIds in
<foreach collection="conditionParamRef.fontIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fontIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fontIdsNotList') and conditionParamRef.fontIdsNotList.size() > 0">
${_conditionType_} a.fontIds not in
<foreach collection="conditionParamRef.fontIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('previewUrl')"> <if test="conditionParamRef.containsKey('previewUrl')">
<if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''"> <if test="conditionParamRef.previewUrl != null and conditionParamRef.previewUrl != ''">
...@@ -531,12 +622,18 @@ ...@@ -531,12 +622,18 @@
${_conditionType_} a.previewUrl is null ${_conditionType_} a.previewUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlList')"> <if test="conditionParamRef.containsKey('previewUrlList') and conditionParamRef.previewUrlList.size() > 0">
${_conditionType_} a.previewUrl in ${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlNotList') and conditionParamRef.previewUrlNotList.size() > 0">
${_conditionType_} a.previewUrl not in
<foreach collection="conditionParamRef.previewUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('draft')"> <if test="conditionParamRef.containsKey('draft')">
<if test="conditionParamRef.draft != null and conditionParamRef.draft != ''"> <if test="conditionParamRef.draft != null and conditionParamRef.draft != ''">
...@@ -546,12 +643,45 @@ ...@@ -546,12 +643,45 @@
${_conditionType_} a.draft is null ${_conditionType_} a.draft is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('draftList')"> <if test="conditionParamRef.containsKey('draftList') and conditionParamRef.draftList.size() > 0">
${_conditionType_} a.draft in ${_conditionType_} a.draft in
<foreach collection="conditionParamRef.draftList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.draftList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('draftNotList') and conditionParamRef.draftNotList.size() > 0">
${_conditionType_} a.draft not in
<foreach collection="conditionParamRef.draftNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designType')">
<if test="conditionParamRef.designType != null ">
${_conditionType_} a.designType = #{${_conditionParam_}.designType}
</if>
<if test="conditionParamRef.designType == null">
${_conditionType_} a.designType is null
</if>
</if>
<if test="conditionParamRef.containsKey('designTypeList') and conditionParamRef.designTypeList.size() > 0">
${_conditionType_} a.designType in
<foreach collection="conditionParamRef.designTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designTypeNotList') and conditionParamRef.designTypeNotList.size() > 0">
${_conditionType_} a.designType not in
<foreach collection="conditionParamRef.designTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designTypeStart') and conditionParamRef.designTypeStart != null">
${_conditionType_} a.designType <![CDATA[ >= ]]> #{${_conditionParam_}.designTypeStart}
</if>
<if test="conditionParamRef.containsKey('designTypeEnd') and conditionParamRef.designTypeEnd != null">
${_conditionType_} a.designType <![CDATA[ <= ]]> #{${_conditionParam_}.designTypeEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -630,6 +760,11 @@ ...@@ -630,6 +760,11 @@
<if test='orderCol.draft != null and "DESC".equalsIgnoreCase(orderCol.draft)'>DESC</if> <if test='orderCol.draft != null and "DESC".equalsIgnoreCase(orderCol.draft)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('designType')">
a.designType
<if test='orderCol.designType != null and "DESC".equalsIgnoreCase(orderCol.designType)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
datav-manager/src/main/resources/sqlmap/module/design/DesignMasterplateMapper.xml
View file @ b516bd52
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<result property="previewUrl" column="previewUrl" /> <result property="previewUrl" column="previewUrl" />
<result property="draft" column="draft" /> <result property="draft" column="draft" />
<result property="plateType" column="plateType" /> <result property="plateType" column="plateType" />
<result property="designType" column="designType" />
</resultMap> </resultMap>
...@@ -76,23 +77,26 @@ ...@@ -76,23 +77,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('plateType') or colPickMode == 1 and data.containsKey('plateType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('plateType') or colPickMode == 1 and data.containsKey('plateType')))">
a.plateType, a.plateType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('designType') or colPickMode == 1 and data.containsKey('designType')))">
a.designType,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DesignMasterplateEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DesignMasterplateEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_design_masterplate insert into mortals_xhx_design_masterplate
(masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft,plateType) (masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft,plateType,designType)
VALUES VALUES
(#{masterplateName},#{masterplateCode},#{customerId},#{customerName},#{createTime},#{masterplateDesc},#{masterplatePath},#{pictureIds},#{pictureSrcIds},#{pictureBackgroundIds},#{fontIds},#{masterplateUseNum},#{previewUrl},#{draft},#{plateType}) (#{masterplateName},#{masterplateCode},#{customerId},#{customerName},#{createTime},#{masterplateDesc},#{masterplatePath},#{pictureIds},#{pictureSrcIds},#{pictureBackgroundIds},#{fontIds},#{masterplateUseNum},#{previewUrl},#{draft},#{plateType},#{designType})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_design_masterplate insert into mortals_xhx_design_masterplate
(masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft,plateType) (masterplateName,masterplateCode,customerId,customerName,createTime,masterplateDesc,masterplatePath,pictureIds,pictureSrcIds,pictureBackgroundIds,fontIds,masterplateUseNum,previewUrl,draft,plateType,designType)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.masterplateName},#{item.masterplateCode},#{item.customerId},#{item.customerName},#{item.createTime},#{item.masterplateDesc},#{item.masterplatePath},#{item.pictureIds},#{item.pictureSrcIds},#{item.pictureBackgroundIds},#{item.fontIds},#{item.masterplateUseNum},#{item.previewUrl},#{item.draft},#{item.plateType}) (#{item.masterplateName},#{item.masterplateCode},#{item.customerId},#{item.customerName},#{item.createTime},#{item.masterplateDesc},#{item.masterplatePath},#{item.pictureIds},#{item.pictureSrcIds},#{item.pictureBackgroundIds},#{item.fontIds},#{item.masterplateUseNum},#{item.previewUrl},#{item.draft},#{item.plateType},#{item.designType})
</foreach> </foreach>
</insert> </insert>
...@@ -159,6 +163,12 @@ ...@@ -159,6 +163,12 @@
<if test="(colPickMode==0 and data.containsKey('plateTypeIncrement')) or (colPickMode==1 and !data.containsKey('plateTypeIncrement'))"> <if test="(colPickMode==0 and data.containsKey('plateTypeIncrement')) or (colPickMode==1 and !data.containsKey('plateTypeIncrement'))">
a.plateType=ifnull(a.plateType,0) + #{data.plateTypeIncrement}, a.plateType=ifnull(a.plateType,0) + #{data.plateTypeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('designType')) or (colPickMode==1 and !data.containsKey('designType'))">
a.designType=#{data.designType},
</if>
<if test="(colPickMode==0 and data.containsKey('designTypeIncrement')) or (colPickMode==1 and !data.containsKey('designTypeIncrement'))">
a.designType=ifnull(a.designType,0) + #{data.designTypeIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -296,6 +306,18 @@ ...@@ -296,6 +306,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="designType=(case" suffix="ELSE designType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('designType')) or (colPickMode==1 and !item.containsKey('designType'))">
when a.id=#{item.id} then #{item.designType}
</when>
<when test="(colPickMode==0 and item.containsKey('designTypeIncrement')) or (colPickMode==1 and !item.containsKey('designTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.designType,0) + #{item.designTypeIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -319,6 +341,21 @@ ...@@ -319,6 +341,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_design_masterplate where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_design_masterplate where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_design_masterplate as a delete a.* from mortals_xhx_design_masterplate as a
...@@ -405,12 +442,18 @@ ...@@ -405,12 +442,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -427,12 +470,18 @@ ...@@ -427,12 +470,18 @@
${_conditionType_} a.masterplateName is null ${_conditionType_} a.masterplateName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateNameList')"> <if test="conditionParamRef.containsKey('masterplateNameList') and conditionParamRef.masterplateNameList.size() > 0">
${_conditionType_} a.masterplateName in ${_conditionType_} a.masterplateName in
<foreach collection="conditionParamRef.masterplateNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.masterplateNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateNameNotList') and conditionParamRef.masterplateNameNotList.size() > 0">
${_conditionType_} a.masterplateName not in
<foreach collection="conditionParamRef.masterplateNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('masterplateCode')"> <if test="conditionParamRef.containsKey('masterplateCode')">
<if test="conditionParamRef.masterplateCode != null "> <if test="conditionParamRef.masterplateCode != null ">
${_conditionType_} a.masterplateCode = #{${_conditionParam_}.masterplateCode} ${_conditionType_} a.masterplateCode = #{${_conditionParam_}.masterplateCode}
...@@ -441,12 +490,18 @@ ...@@ -441,12 +490,18 @@
${_conditionType_} a.masterplateCode is null ${_conditionType_} a.masterplateCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateCodeList')"> <if test="conditionParamRef.containsKey('masterplateCodeList') and conditionParamRef.masterplateCodeList.size() > 0">
${_conditionType_} a.masterplateCode in ${_conditionType_} a.masterplateCode in
<foreach collection="conditionParamRef.masterplateCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.masterplateCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateCodeNotList') and conditionParamRef.masterplateCodeNotList.size() > 0">
${_conditionType_} a.masterplateCode not in
<foreach collection="conditionParamRef.masterplateCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('masterplateCodeStart') and conditionParamRef.masterplateCodeStart != null"> <if test="conditionParamRef.containsKey('masterplateCodeStart') and conditionParamRef.masterplateCodeStart != null">
${_conditionType_} a.masterplateCode <![CDATA[ >= ]]> #{${_conditionParam_}.masterplateCodeStart} ${_conditionType_} a.masterplateCode <![CDATA[ >= ]]> #{${_conditionParam_}.masterplateCodeStart}
</if> </if>
...@@ -462,12 +517,18 @@ ...@@ -462,12 +517,18 @@
${_conditionType_} a.customerId is null ${_conditionType_} a.customerId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('customerIdList')"> <if test="conditionParamRef.containsKey('customerIdList') and conditionParamRef.customerIdList.size() > 0">
${_conditionType_} a.customerId in ${_conditionType_} a.customerId in
<foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.customerIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('customerIdNotList') and conditionParamRef.customerIdNotList.size() > 0">
${_conditionType_} a.customerId not in
<foreach collection="conditionParamRef.customerIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null"> <if test="conditionParamRef.containsKey('customerIdStart') and conditionParamRef.customerIdStart != null">
${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart} ${_conditionType_} a.customerId <![CDATA[ >= ]]> #{${_conditionParam_}.customerIdStart}
</if> </if>
...@@ -484,12 +545,18 @@ ...@@ -484,12 +545,18 @@
${_conditionType_} a.customerName is null ${_conditionType_} a.customerName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('customerNameList')"> <if test="conditionParamRef.containsKey('customerNameList') and conditionParamRef.customerNameList.size() > 0">
${_conditionType_} a.customerName in ${_conditionType_} a.customerName in
<foreach collection="conditionParamRef.customerNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.customerNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('customerNameNotList') and conditionParamRef.customerNameNotList.size() > 0">
${_conditionType_} a.customerName not in
<foreach collection="conditionParamRef.customerNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
...@@ -514,12 +581,18 @@ ...@@ -514,12 +581,18 @@
${_conditionType_} a.masterplateDesc is null ${_conditionType_} a.masterplateDesc is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateDescList')"> <if test="conditionParamRef.containsKey('masterplateDescList') and conditionParamRef.masterplateDescList.size() > 0">
${_conditionType_} a.masterplateDesc in ${_conditionType_} a.masterplateDesc in
<foreach collection="conditionParamRef.masterplateDescList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.masterplateDescList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateDescNotList') and conditionParamRef.masterplateDescNotList.size() > 0">
${_conditionType_} a.masterplateDesc not in
<foreach collection="conditionParamRef.masterplateDescNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('masterplatePath')"> <if test="conditionParamRef.containsKey('masterplatePath')">
<if test="conditionParamRef.masterplatePath != null and conditionParamRef.masterplatePath != ''"> <if test="conditionParamRef.masterplatePath != null and conditionParamRef.masterplatePath != ''">
...@@ -529,12 +602,18 @@ ...@@ -529,12 +602,18 @@
${_conditionType_} a.masterplatePath is null ${_conditionType_} a.masterplatePath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('masterplatePathList')"> <if test="conditionParamRef.containsKey('masterplatePathList') and conditionParamRef.masterplatePathList.size() > 0">
${_conditionType_} a.masterplatePath in ${_conditionType_} a.masterplatePath in
<foreach collection="conditionParamRef.masterplatePathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.masterplatePathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('masterplatePathNotList') and conditionParamRef.masterplatePathNotList.size() > 0">
${_conditionType_} a.masterplatePath not in
<foreach collection="conditionParamRef.masterplatePathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pictureIds')"> <if test="conditionParamRef.containsKey('pictureIds')">
<if test="conditionParamRef.pictureIds != null and conditionParamRef.pictureIds != ''"> <if test="conditionParamRef.pictureIds != null and conditionParamRef.pictureIds != ''">
...@@ -544,12 +623,18 @@ ...@@ -544,12 +623,18 @@
${_conditionType_} a.pictureIds is null ${_conditionType_} a.pictureIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pictureIdsList')"> <if test="conditionParamRef.containsKey('pictureIdsList') and conditionParamRef.pictureIdsList.size() > 0">
${_conditionType_} a.pictureIds in ${_conditionType_} a.pictureIds in
<foreach collection="conditionParamRef.pictureIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pictureIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pictureIdsNotList') and conditionParamRef.pictureIdsNotList.size() > 0">
${_conditionType_} a.pictureIds not in
<foreach collection="conditionParamRef.pictureIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pictureSrcIds')"> <if test="conditionParamRef.containsKey('pictureSrcIds')">
<if test="conditionParamRef.pictureSrcIds != null and conditionParamRef.pictureSrcIds != ''"> <if test="conditionParamRef.pictureSrcIds != null and conditionParamRef.pictureSrcIds != ''">
...@@ -559,12 +644,18 @@ ...@@ -559,12 +644,18 @@
${_conditionType_} a.pictureSrcIds is null ${_conditionType_} a.pictureSrcIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pictureSrcIdsList')"> <if test="conditionParamRef.containsKey('pictureSrcIdsList') and conditionParamRef.pictureSrcIdsList.size() > 0">
${_conditionType_} a.pictureSrcIds in ${_conditionType_} a.pictureSrcIds in
<foreach collection="conditionParamRef.pictureSrcIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pictureSrcIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pictureSrcIdsNotList') and conditionParamRef.pictureSrcIdsNotList.size() > 0">
${_conditionType_} a.pictureSrcIds not in
<foreach collection="conditionParamRef.pictureSrcIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('pictureBackgroundIds')"> <if test="conditionParamRef.containsKey('pictureBackgroundIds')">
<if test="conditionParamRef.pictureBackgroundIds != null and conditionParamRef.pictureBackgroundIds != ''"> <if test="conditionParamRef.pictureBackgroundIds != null and conditionParamRef.pictureBackgroundIds != ''">
...@@ -574,12 +665,18 @@ ...@@ -574,12 +665,18 @@
${_conditionType_} a.pictureBackgroundIds is null ${_conditionType_} a.pictureBackgroundIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pictureBackgroundIdsList')"> <if test="conditionParamRef.containsKey('pictureBackgroundIdsList') and conditionParamRef.pictureBackgroundIdsList.size() > 0">
${_conditionType_} a.pictureBackgroundIds in ${_conditionType_} a.pictureBackgroundIds in
<foreach collection="conditionParamRef.pictureBackgroundIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.pictureBackgroundIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pictureBackgroundIdsNotList') and conditionParamRef.pictureBackgroundIdsNotList.size() > 0">
${_conditionType_} a.pictureBackgroundIds not in
<foreach collection="conditionParamRef.pictureBackgroundIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fontIds')"> <if test="conditionParamRef.containsKey('fontIds')">
<if test="conditionParamRef.fontIds != null and conditionParamRef.fontIds != ''"> <if test="conditionParamRef.fontIds != null and conditionParamRef.fontIds != ''">
...@@ -589,12 +686,18 @@ ...@@ -589,12 +686,18 @@
${_conditionType_} a.fontIds is null ${_conditionType_} a.fontIds is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('fontIdsList')"> <if test="conditionParamRef.containsKey('fontIdsList') and conditionParamRef.fontIdsList.size() > 0">
${_conditionType_} a.fontIds in ${_conditionType_} a.fontIds in
<foreach collection="conditionParamRef.fontIdsList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.fontIdsList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fontIdsNotList') and conditionParamRef.fontIdsNotList.size() > 0">
${_conditionType_} a.fontIds not in
<foreach collection="conditionParamRef.fontIdsNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('masterplateUseNum')"> <if test="conditionParamRef.containsKey('masterplateUseNum')">
<if test="conditionParamRef.masterplateUseNum != null "> <if test="conditionParamRef.masterplateUseNum != null ">
${_conditionType_} a.masterplateUseNum = #{${_conditionParam_}.masterplateUseNum} ${_conditionType_} a.masterplateUseNum = #{${_conditionParam_}.masterplateUseNum}
...@@ -603,12 +706,18 @@ ...@@ -603,12 +706,18 @@
${_conditionType_} a.masterplateUseNum is null ${_conditionType_} a.masterplateUseNum is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateUseNumList')"> <if test="conditionParamRef.containsKey('masterplateUseNumList') and conditionParamRef.masterplateUseNumList.size() > 0">
${_conditionType_} a.masterplateUseNum in ${_conditionType_} a.masterplateUseNum in
<foreach collection="conditionParamRef.masterplateUseNumList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.masterplateUseNumList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('masterplateUseNumNotList') and conditionParamRef.masterplateUseNumNotList.size() > 0">
${_conditionType_} a.masterplateUseNum not in
<foreach collection="conditionParamRef.masterplateUseNumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('masterplateUseNumStart') and conditionParamRef.masterplateUseNumStart != null"> <if test="conditionParamRef.containsKey('masterplateUseNumStart') and conditionParamRef.masterplateUseNumStart != null">
${_conditionType_} a.masterplateUseNum <![CDATA[ >= ]]> #{${_conditionParam_}.masterplateUseNumStart} ${_conditionType_} a.masterplateUseNum <![CDATA[ >= ]]> #{${_conditionParam_}.masterplateUseNumStart}
</if> </if>
...@@ -625,12 +734,18 @@ ...@@ -625,12 +734,18 @@
${_conditionType_} a.previewUrl is null ${_conditionType_} a.previewUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlList')"> <if test="conditionParamRef.containsKey('previewUrlList') and conditionParamRef.previewUrlList.size() > 0">
${_conditionType_} a.previewUrl in ${_conditionType_} a.previewUrl in
<foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.previewUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('previewUrlNotList') and conditionParamRef.previewUrlNotList.size() > 0">
${_conditionType_} a.previewUrl not in
<foreach collection="conditionParamRef.previewUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('draft')"> <if test="conditionParamRef.containsKey('draft')">
<if test="conditionParamRef.draft != null and conditionParamRef.draft != ''"> <if test="conditionParamRef.draft != null and conditionParamRef.draft != ''">
...@@ -640,12 +755,18 @@ ...@@ -640,12 +755,18 @@
${_conditionType_} a.draft is null ${_conditionType_} a.draft is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('draftList')"> <if test="conditionParamRef.containsKey('draftList') and conditionParamRef.draftList.size() > 0">
${_conditionType_} a.draft in ${_conditionType_} a.draft in
<foreach collection="conditionParamRef.draftList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.draftList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('draftNotList') and conditionParamRef.draftNotList.size() > 0">
${_conditionType_} a.draft not in
<foreach collection="conditionParamRef.draftNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('plateType')"> <if test="conditionParamRef.containsKey('plateType')">
<if test="conditionParamRef.plateType != null "> <if test="conditionParamRef.plateType != null ">
${_conditionType_} a.plateType = #{${_conditionParam_}.plateType} ${_conditionType_} a.plateType = #{${_conditionParam_}.plateType}
...@@ -654,12 +775,18 @@ ...@@ -654,12 +775,18 @@
${_conditionType_} a.plateType is null ${_conditionType_} a.plateType is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('plateTypeList')"> <if test="conditionParamRef.containsKey('plateTypeList') and conditionParamRef.plateTypeList.size() > 0">
${_conditionType_} a.plateType in ${_conditionType_} a.plateType in
<foreach collection="conditionParamRef.plateTypeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.plateTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('plateTypeNotList') and conditionParamRef.plateTypeNotList.size() > 0">
${_conditionType_} a.plateType not in
<foreach collection="conditionParamRef.plateTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('plateTypeStart') and conditionParamRef.plateTypeStart != null"> <if test="conditionParamRef.containsKey('plateTypeStart') and conditionParamRef.plateTypeStart != null">
${_conditionType_} a.plateType <![CDATA[ >= ]]> #{${_conditionParam_}.plateTypeStart} ${_conditionType_} a.plateType <![CDATA[ >= ]]> #{${_conditionParam_}.plateTypeStart}
</if> </if>
...@@ -667,6 +794,33 @@ ...@@ -667,6 +794,33 @@
${_conditionType_} a.plateType <![CDATA[ <= ]]> #{${_conditionParam_}.plateTypeEnd} ${_conditionType_} a.plateType <![CDATA[ <= ]]> #{${_conditionParam_}.plateTypeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('designType')">
<if test="conditionParamRef.designType != null ">
${_conditionType_} a.designType = #{${_conditionParam_}.designType}
</if>
<if test="conditionParamRef.designType == null">
${_conditionType_} a.designType is null
</if>
</if>
<if test="conditionParamRef.containsKey('designTypeList') and conditionParamRef.designTypeList.size() > 0">
${_conditionType_} a.designType in
<foreach collection="conditionParamRef.designTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designTypeNotList') and conditionParamRef.designTypeNotList.size() > 0">
${_conditionType_} a.designType not in
<foreach collection="conditionParamRef.designTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('designTypeStart') and conditionParamRef.designTypeStart != null">
${_conditionType_} a.designType <![CDATA[ >= ]]> #{${_conditionParam_}.designTypeStart}
</if>
<if test="conditionParamRef.containsKey('designTypeEnd') and conditionParamRef.designTypeEnd != null">
${_conditionType_} a.designType <![CDATA[ <= ]]> #{${_conditionParam_}.designTypeEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -760,6 +914,11 @@ ...@@ -760,6 +914,11 @@
<if test='orderCol.plateType != null and "DESC".equalsIgnoreCase(orderCol.plateType)'>DESC</if> <if test='orderCol.plateType != null and "DESC".equalsIgnoreCase(orderCol.plateType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('designType')">
a.designType
<if test='orderCol.designType != null and "DESC".equalsIgnoreCase(orderCol.designType)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment