Former-commit-id: 1392dc49114e869d2793c1a11eaa8d99d79320cc
master
王兵 4 years ago
parent dad07f7674
commit ad5c9aeb8f

@ -187,19 +187,20 @@ public class SpringBootCallable implements Callable {
{
File ajax = Tool.createPath(root.getAbsolutePath(), "ajax");
HashMap<String, Object> ctxss = new HashMap<String, Object>();
ctxss.put("basePackage", project.getProjectBasePackage());
ctxss.put("author", project.getProjectAuthor());
ctxss.put("date", new Date());
for (Module module : project.getModules()) {
File m = Tool.createPath(ajax.getAbsolutePath(), module.getModuleName());
ctxss.put("moduleName", module.getModuleName());
for (Table table : module.getTables()) {
HashMap<String, Object> ctxss = new HashMap<String, Object>();
ctxss.put("basePackage", project.getProjectBasePackage());
ctxss.put("moduleName", module.getModuleName());
ctxss.put("author", project.getProjectAuthor());
ctxss.put("date", new Date());
ctxss.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(m.getAbsolutePath(), table.getCName() + "Ajax.java"), "SpringBoot/java/action/ajax/Ajax.java", ctxss);
if (table.getHtml()){
ctxss.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(m.getAbsolutePath(), table.getCName() + "Ajax.java"), "SpringBoot/java/action/ajax/Ajax.java", ctxss);
}
}
}

@ -8,13 +8,11 @@ package ${basePackage}.frame.utils;
* @since 2017-01-01
*/
public class Message {
public static final String ERROR_500 = "服务器走了下神,稍后再试一次";
public static final String NOT_EXIST_METHOD = "调用的方法不存在";
public static String CREATE_FAILURE = "创建失败,请刷新后重新尝试";
public static String DELETE_FAILURE = "删除失败,请刷新后重新尝试";
public static String UPDATE_FAILURE = "更新失败,请刷新后重新尝试";
public static String FIND_FAILURE = "查询失败,请刷新后重新尝试";
public static String GET_FAILURE = "未获取相应内容";
public static String INSERT_DUPLICATE = "已经存在相同数据,返回列表页面确认";
public static String CREATE_FAILURE = "创建失败,请刷新后重新尝试!";
public static String DELETE_FAILURE = "删除失败,请刷新后重新尝试!";
public static String UPDATE_FAILURE = "更新失败,请刷新后重新尝试!";
public static String FIND_FAILURE = "查询失败,请刷新后重新尝试!";
public static String GET_FAILURE = "对象不存在!";
public static String INSERT_DUPLICATE = "已经存在相同数据,返回列表页面确认!";
}

@ -84,26 +84,26 @@ public interface ${table.getCName()}Manager {
*/
${table.getCName()}FindResponse find(${table.getCName()}FindRequest request, Token token);
</#if>
<#if table.getGet()>
<#if table.getSearch()>
/**
* 获得对象
* 模糊查询
*
* @param request 请求对象
* @param token 令牌
* @return
*/
${table.getCName()}GetResponse get(${table.getCName()}GetRequest request, Token token);
${table.getCName()}SearchResponse search(${table.getCName()}SearchRequest request, Token token);
</#if>
<#if table.getSearch()>
<#if table.getGet()>
/**
* 模糊查询
* 获得对象
*
* @param request 请求对象
* @param token 令牌
* @return
*/
${table.getCName()}SearchResponse search(${table.getCName()}SearchRequest request, Token token);
${table.getCName()}GetResponse get(${table.getCName()}GetRequest request, Token token);
</#if>
}

@ -129,7 +129,7 @@ public class ${table.getCName()}ManagerImpl implements ${table.getCName()}Manage
return response;
}
long result = ${table.getFName()}Mapper.delete(request, token);
long result = ${table.getFName()}Mapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -156,7 +156,14 @@ public class ${table.getCName()}ManagerImpl implements ${table.getCName()}Manage
return response;
}
long result = ${table.getFName()}Mapper.update(request, token);
${table.getCName()} entity = ${table.getFName()}Mapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = ${table.getFName()}Mapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -216,7 +223,7 @@ public class ${table.getCName()}ManagerImpl implements ${table.getCName()}Manage
return response;
}
${table.getCName()} po = ${table.getFName()}Mapper.get(request, token);
${table.getCName()} po = ${table.getFName()}Mapper.getById(request.getId(), token);
if (po != null) {
response.set${table.getCName()}(po);

@ -78,10 +78,10 @@
</#if>
</#list>
<if test="request.startDate != null">
AND strftime('%s',"CREATE_TIME", 'utc')*1000 &gt;= #{request.startDate}
AND strftime('%s',"CREATE_TIME", 'utc')*1000 &gt;= ${r"#{"}{request.startDate}
</if>
<if test="request.endDate != null">
AND strftime('%s',"CREATE_TIME", 'utc')*1000 &lt;= #{request.endDate}
AND strftime('%s',"CREATE_TIME", 'utc')*1000 &lt;= ${r"#{"}{request.endDate}
</if>
</select>

@ -4,20 +4,11 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.${moduleName}.ent.${table.getCName()};
<#if table.getCreate()>
import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
</#if>
<#if table.getDelete()>
import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
</#if>
<#if table.getFind()>
import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
</#if>
<#if table.getGet()>
import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
</#if>
<#if table.getUpdate()>
import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
<#if table.getSearch()>
import ${basePackage}.module.${moduleName}.req.${table.getCName()}SearchRequest;
</#if>
import java.util.List;
@ -26,11 +17,10 @@ import java.util.List;
* ${table.tableName} - ${table.tableComment}
*
* @author ${author?default("")}
* @date ${date?string("yyyy-MM-dd")}
* @since ${date?string("yyyy-MM-dd")}
*/
@Mapper
public interface ${table.getCName()}Mapper {
<#if table.getCreate()>
/**
*
@ -44,24 +34,29 @@ public interface ${table.getCName()}Mapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<${table.getCName()}> request, @Param("token") Token token);
</#if>
<#if table.getDelete()>
long insertBatch(@Param("list") List<${table.getCName()}> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("request") ${table.getCName()}DeleteRequest request, @Param("token") Token token);
</#if>
<#if table.getUpdate()>
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -70,8 +65,7 @@ public interface ${table.getCName()}Mapper {
* @param token
* @return
*/
long update(@Param("request") ${table.getCName()}UpdateRequest request, @Param("token") Token token);
</#if>
long update(@Param("request") ${table.getCName()} request, @Param("token") Token token);
<#if table.getFind()>
/**
@ -83,26 +77,33 @@ public interface ${table.getCName()}Mapper {
*/
List<${table.getCName()}> find(@Param("request") ${table.getCName()}FindRequest request, @Param("token") Token token);
</#if>
<#if table.getGet()>
<#if table.getSearch()>
/**
*
*
*
* @param request
* @param token
* @return
*/
${table.getCName()} get(@Param("request") ${table.getCName()}GetRequest request, @Param("token") Token token);
List<${table.getCName()}> search(@Param("request") ${table.getCName()}SearchRequest request, @Param("token") Token token);
</#if>
<#if table.getSearch()>
/**
*
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
List<${table.getCName()}> search(@Param("request") ${table.getCName()}SearchRequest request, @Param("token") Token token);
</#if>
${table.getCName()} getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
List<${table.getCName()}> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -119,7 +119,7 @@ public class DeptManagerImpl implements DeptManager {
return response;
}
long result = deptMapper.delete(request, token);
long result = deptMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -144,7 +144,14 @@ public class DeptManagerImpl implements DeptManager {
return response;
}
long result = deptMapper.update(request, token);
Dept entity = deptMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = deptMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -200,7 +207,7 @@ public class DeptManagerImpl implements DeptManager {
return response;
}
Dept po = deptMapper.get(request, token);
Dept po = deptMapper.getById(request.getId(), token);
if (po != null) {
response.setDept(po);

@ -98,7 +98,7 @@ public class DictItemManagerImpl implements DictItemManager {
return response;
}
long result = dictItemMapper.delete(request, token);
long result = dictItemMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -123,7 +123,14 @@ public class DictItemManagerImpl implements DictItemManager {
return response;
}
long result = dictItemMapper.update(request, token);
DictItem entity = dictItemMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = dictItemMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -179,7 +186,7 @@ public class DictItemManagerImpl implements DictItemManager {
return response;
}
DictItem po = dictItemMapper.get(request, token);
DictItem po = dictItemMapper.getById(request.getId(), token);
if (po != null) {
response.setDictItem(po);

@ -105,7 +105,7 @@ public class DictManagerImpl implements DictManager {
return response;
}
long result = dictMapper.delete(request, token);
long result = dictMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -130,7 +130,14 @@ public class DictManagerImpl implements DictManager {
return response;
}
long result = dictMapper.update(request, token);
Dict entity = dictMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = dictMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -186,7 +193,7 @@ public class DictManagerImpl implements DictManager {
return response;
}
Dict po = dictMapper.get(request, token);
Dict po = dictMapper.getById(request.getId(), token);
if (po != null) {
response.setDict(po);

@ -81,7 +81,7 @@ public class FileManagerImpl implements FileManager {
return response;
}
long result = fileMapper.delete(request, token);
long result = fileMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -137,7 +137,7 @@ public class FileManagerImpl implements FileManager {
return response;
}
File po = fileMapper.get(request, token);
File po = fileMapper.getById(request.getId(), token);
if (po != null) {
response.setFile(po);

@ -84,7 +84,7 @@ public class LogErrManagerImpl implements ${basePackage}.module.system.mgr.LogEr
return response;
}
long result = logErrMapper.delete(request, token);
long result = logErrMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -109,7 +109,14 @@ public class LogErrManagerImpl implements ${basePackage}.module.system.mgr.LogEr
return response;
}
long result = logErrMapper.update(request, token);
LogErr entity = logErrMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = logErrMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -165,7 +172,7 @@ public class LogErrManagerImpl implements ${basePackage}.module.system.mgr.LogEr
return response;
}
LogErr po = logErrMapper.get(request, token);
LogErr po = logErrMapper.getById(request.getId(), token);
if (po != null) {
response.setLogErr(po);

@ -99,7 +99,7 @@ public class ProfilesManagerImpl implements ProfilesManager {
return response;
}
long result = profilesMapper.delete(request, token);
long result = profilesMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -124,7 +124,14 @@ public class ProfilesManagerImpl implements ProfilesManager {
return response;
}
long result = profilesMapper.update(request, token);
Profiles entity = profilesMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = profilesMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -180,7 +187,7 @@ public class ProfilesManagerImpl implements ProfilesManager {
return response;
}
Profiles po = profilesMapper.get(request, token);
Profiles po = profilesMapper.getById(request.getId(), token);
if (po != null) {
response.setProfiles(po);

@ -106,7 +106,7 @@ public class ResManagerImpl implements ResManager {
return response;
}
long result = resMapper.delete(request, token);
long result = resMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -131,7 +131,14 @@ public class ResManagerImpl implements ResManager {
return response;
}
long result = resMapper.update(request, token);
Res entity = resMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = resMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -210,7 +217,7 @@ public class ResManagerImpl implements ResManager {
return response;
}
Res po = resMapper.get(request, token);
Res po = resMapper.getById(request.getId(), token);
if (po != null) {
response.setRes(po);

@ -96,7 +96,7 @@ public class RoleManagerImpl implements RoleManager {
return response;
}
long result = roleMapper.delete(request, token);
long result = roleMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -121,7 +121,14 @@ public class RoleManagerImpl implements RoleManager {
return response;
}
long result = roleMapper.update(request, token);
Role entity = roleMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = roleMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -177,7 +184,7 @@ public class RoleManagerImpl implements RoleManager {
return response;
}
Role po = roleMapper.get(request, token);
Role po = roleMapper.getById(request.getId(), token);
if (po != null) {
response.setRole(po);

@ -86,7 +86,7 @@ public class RoleResManagerImpl implements RoleResManager {
return response;
}
long result = roleResMapper.delete(request, token);
long result = roleResMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -111,7 +111,14 @@ public class RoleResManagerImpl implements RoleResManager {
return response;
}
long result = roleResMapper.update(request, token);
RoleRes entity = roleResMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = roleResMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -167,7 +174,7 @@ public class RoleResManagerImpl implements RoleResManager {
return response;
}
RoleRes po = roleResMapper.get(request, token);
RoleRes po = roleResMapper.getById(request.getId(), token);
if (po != null) {
response.setRoleRes(po);

@ -3,14 +3,16 @@ package ${basePackage}.module.system.mgr;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.frame.base.ErrorType;
import ${basePackage}.frame.utils.IDgenerator;
import ${basePackage}.frame.utils.ValidationUtil;
import ${basePackage}.module.system.ent.Sequence;
import ${basePackage}.module.system.mpr.SequenceMapper;
import ${basePackage}.module.system.req.SequenceGetRequest;
import ${basePackage}.module.system.rsp.SequenceGetResponse;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.frame.base.ErrorType;
import xyz.wbsite.frame.utils.IDgenerator;
import xyz.wbsite.frame.utils.ValidationUtil;
import xyz.wbsite.module.system.ent.Sequence;
import xyz.wbsite.module.system.mpr.SequenceMapper;
import xyz.wbsite.module.system.req.SequenceFindRequest;
import xyz.wbsite.module.system.req.SequenceGetRequest;
import xyz.wbsite.module.system.rsp.SequenceGetResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
@ -61,12 +63,12 @@ public class SequenceManagerImpl implements SequenceManager {
int retryCount = 100;
do {
// 首先查询是否已经开始的序列
Sequence forFind = new Sequence();
forFind.setSeqName(request.getSeqName());
forFind.setYear(year);
forFind.setMonth(month);
forFind.setDate(date);
List<Sequence> sequenceList = sequenceMapper.find(forFind, token);
SequenceFindRequest sequenceFindRequest = new SequenceFindRequest();
sequenceFindRequest.setSeqName(request.getSeqName());
sequenceFindRequest.setYear(year);
sequenceFindRequest.setMonth(month);
sequenceFindRequest.setDate(date);
List<Sequence> sequenceList = sequenceMapper.find(sequenceFindRequest, token);
if (sequenceList.size() > 0) {
Sequence sequence = sequenceList.get(0);
// 检查流水是否达到上限,达到最大值或理论最大值
@ -100,6 +102,13 @@ public class SequenceManagerImpl implements SequenceManager {
retryCount--;
} while (value <= 0 && retryCount > 0);
try {
TransactionAspectSupport.currentTransactionStatus().flush();
} catch (Exception e) {
response.addError(ErrorType.BUSINESS_ERROR, "生成序列失败,请稍后再试!");
return response;
}
response.setSequence(String.format(Locale.CHINA, "%s%s%s%s%0" + String.valueOf(request.getMaxValue()).length() + "d",
request.getSeqPrefix(),
year == null ? "" : year,

@ -111,7 +111,7 @@ public class TaskSqlManagerImpl implements TaskSqlManager {
return response;
}
long result = taskSqlMapper.delete(request, token);
long result = taskSqlMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -154,7 +154,14 @@ public class TaskSqlManagerImpl implements TaskSqlManager {
}
}
long result = taskSqlMapper.update(request, token);
TaskSql entity = taskSqlMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = taskSqlMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -215,7 +222,7 @@ public class TaskSqlManagerImpl implements TaskSqlManager {
return response;
}
TaskSql po = taskSqlMapper.get(request, token);
TaskSql po = taskSqlMapper.getById(request.getId(), token);
if (po != null) {
response.setTaskSql(po);

@ -128,13 +128,19 @@ public class TokensManagerImpl implements ${basePackage}.module.system.mgr.Token
if (response.hasError()) {
return response;
}
long result = tokensMapper.delete(request, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
TokensFindRequest tokensFindRequest = new TokensFindRequest();
tokensFindRequest.setValid(true);
tokensFindRequest.setToken(request.getToken());
tokensFindRequest.setPageSize(0);
TokensFindResponse tokensFindResponse = this.find(tokensFindRequest, token);
for (Tokens tokens : tokensFindResponse.getResult()) {
long result = tokensMapper.delete(tokens.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
}
}
response.setResult(result);
response.setResult(tokensFindResponse.getTotalCount());
return response;
}
@ -155,7 +161,14 @@ public class TokensManagerImpl implements ${basePackage}.module.system.mgr.Token
return response;
}
long result = tokensMapper.update(request, token);
Tokens entity = tokensMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = tokensMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -211,7 +224,7 @@ public class TokensManagerImpl implements ${basePackage}.module.system.mgr.Token
return response;
}
Tokens po = tokensMapper.get(request, token);
Tokens po = tokensMapper.getById(request.getId(), token);
if (po != null) {
response.setTokens(po);
@ -320,9 +333,8 @@ public class TokensManagerImpl implements ${basePackage}.module.system.mgr.Token
}
for (Tokens tokens : tokensFindResponse.getResult()) {
TokensUpdateRequest tokensUpdateRequest = MapperUtil.map(tokens, TokensUpdateRequest.class);
tokensUpdateRequest.setValid(false);
long result = tokensMapper.update(tokensUpdateRequest, token);
tokens.setValid(false);
long result = tokensMapper.update(tokens, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;

@ -157,7 +157,7 @@ public class UserManagerImpl implements UserManager {
return response;
}
long result = userMapper.delete(request, token);
long result = userMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -182,7 +182,14 @@ public class UserManagerImpl implements UserManager {
return response;
}
long result = userMapper.update(request, token);
User entity = userMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = userMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -238,7 +245,7 @@ public class UserManagerImpl implements UserManager {
return response;
}
User po = userMapper.get(request, token);
User po = userMapper.getById(request.getId(), token);
if (po != null) {
response.setUser(po);

@ -83,7 +83,7 @@ public class UserRoleManagerImpl implements UserRoleManager {
return response;
}
long result = userRoleMapper.delete(request, token);
long result = userRoleMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -108,7 +108,14 @@ public class UserRoleManagerImpl implements UserRoleManager {
return response;
}
long result = userRoleMapper.update(request, token);
UserRole entity = userRoleMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = userRoleMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -164,7 +171,7 @@ public class UserRoleManagerImpl implements UserRoleManager {
return response;
}
UserRole po = userRoleMapper.get(request, token);
UserRole po = userRoleMapper.getById(request.getId(), token);
if (po != null) {
response.setUserRole(po);

@ -96,7 +96,7 @@ public class VisitorManagerImpl implements VisitorManager {
return response;
}
long result = visitorMapper.delete(request, token);
long result = visitorMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -121,7 +121,14 @@ public class VisitorManagerImpl implements VisitorManager {
return response;
}
long result = visitorMapper.update(request, token);
Visitor entity = visitorMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = visitorMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;
@ -177,7 +184,7 @@ public class VisitorManagerImpl implements VisitorManager {
return response;
}
Visitor po = visitorMapper.get(request, token);
Visitor po = visitorMapper.getById(request.getId(), token);
if (po != null) {
response.setVisitor(po);

@ -81,7 +81,7 @@ public class VisitorResManagerImpl implements VisitorResManager {
return response;
}
long result = visitorResMapper.delete(request, token);
long result = visitorResMapper.delete(request.getId(), token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.DELETE_FAILURE);
return response;
@ -106,7 +106,14 @@ public class VisitorResManagerImpl implements VisitorResManager {
return response;
}
long result = visitorResMapper.update(request, token);
VisitorRes entity = visitorResMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
}
MapperUtil.map(request, entity);
long result = visitorResMapper.update(entity, token);
if (1L != result) {
response.addError(ErrorType.BUSINESS_ERROR, Message.UPDATE_FAILURE);
return response;

@ -1,23 +1,18 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Dept;
import xyz.wbsite.module.system.req.DeptFindRequest;
import java.util.List;
import ${basePackage}.module.system.ent.Dept;
import ${basePackage}.module.system.req.DeptCreateRequest;
import ${basePackage}.module.system.req.DeptDeleteRequest;
import ${basePackage}.module.system.req.DeptFindRequest;
import ${basePackage}.module.system.req.DeptGetRequest;
import ${basePackage}.module.system.req.DeptUpdateRequest;
import ${basePackage}.frame.auth.Token;
/**
* DEPT -
*
* @author wangbing
* @date 2019-12-24
* @since 2020-06-27
*/
@Mapper
public interface DeptMapper {
@ -34,20 +29,29 @@ public interface DeptMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Dept> request, @Param("token") Token token);
long insertBatch(@Param("list") List<Dept> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") DeptDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -56,7 +60,7 @@ public interface DeptMapper {
* @param token
* @return
*/
long update(@Param("request") DeptUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Dept request, @Param("token") Token token);
/**
*
@ -70,9 +74,18 @@ public interface DeptMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Dept getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Dept get(@Param("request") DeptGetRequest request, @Param("token") Token token);
List<Dept> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,13 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.DictItem;
import ${basePackage}.module.system.req.DictItemDeleteRequest;
import ${basePackage}.module.system.req.DictItemFindRequest;
import ${basePackage}.module.system.req.DictItemGetRequest;
import ${basePackage}.module.system.req.DictItemUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.DictItem;
import xyz.wbsite.module.system.req.DictItemFindRequest;
import java.util.List;
@ -15,7 +12,7 @@ import java.util.List;
* DICT_ITEM -
*
* @author wangbing
* @since 2017-01-01
* @since 2020-06-27
*/
@Mapper
public interface DictItemMapper {
@ -29,14 +26,32 @@ public interface DictItemMapper {
*/
long insert(@Param("request") DictItem request, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<DictItem> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") DictItemDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -45,7 +60,7 @@ public interface DictItemMapper {
* @param token
* @return
*/
long update(@Param("request") DictItemUpdateRequest request, @Param("token") Token token);
long update(@Param("request") DictItem request, @Param("token") Token token);
/**
*
@ -59,9 +74,18 @@ public interface DictItemMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
DictItem getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
DictItem get(@Param("request") DictItemGetRequest request, @Param("token") Token token);
List<DictItem> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,13 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.Dict;
import ${basePackage}.module.system.req.DictDeleteRequest;
import ${basePackage}.module.system.req.DictFindRequest;
import ${basePackage}.module.system.req.DictGetRequest;
import ${basePackage}.module.system.req.DictUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Dict;
import xyz.wbsite.module.system.req.DictFindRequest;
import java.util.List;
@ -15,7 +12,7 @@ import java.util.List;
* DICT -
*
* @author wangbing
* @since 2017-01-01
* @since 2020-06-27
*/
@Mapper
public interface DictMapper {
@ -29,14 +26,32 @@ public interface DictMapper {
*/
long insert(@Param("request") Dict request, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Dict> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") DictDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -45,7 +60,7 @@ public interface DictMapper {
* @param token
* @return
*/
long update(@Param("request") DictUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Dict request, @Param("token") Token token);
/**
*
@ -59,9 +74,18 @@ public interface DictMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Dict getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Dict get(@Param("request") DictGetRequest request, @Param("token") Token token);
List<Dict> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,20 +1,18 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.File;
import ${basePackage}.module.system.req.FileDeleteRequest;
import ${basePackage}.module.system.req.FileFindRequest;
import ${basePackage}.module.system.req.FileGetRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.File;
import xyz.wbsite.module.system.req.FileFindRequest;
import java.util.List;
/**
* FILE -
*
* @author author
* @date 2019-11-29
* @author wangbing
* @since 2020-06-27
*/
@Mapper
public interface FileMapper {
@ -31,20 +29,38 @@ public interface FileMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<File> request, @Param("token") Token token);
long insertBatch(@Param("list") List<File> list, @Param("token") Token token);
/**
*
*
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @return
*/
long delete(@Param("request") FileDeleteRequest request, @Param("token") Token token);
long update(@Param("request") File request, @Param("token") Token token);
/**
*
@ -58,9 +74,18 @@ public interface FileMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
File getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
File get(@Param("request") FileGetRequest request, @Param("token") Token token);
List<File> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,13 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.LogErr;
import ${basePackage}.module.system.req.LogErrDeleteRequest;
import ${basePackage}.module.system.req.LogErrFindRequest;
import ${basePackage}.module.system.req.LogErrGetRequest;
import ${basePackage}.module.system.req.LogErrUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.LogErr;
import xyz.wbsite.module.system.req.LogErrFindRequest;
import java.util.List;
@ -15,7 +12,7 @@ import java.util.List;
* LOG_ERR -
*
* @author wangbing
* @date 2020-01-29
* @since 2020-06-27
*/
@Mapper
public interface LogErrMapper {
@ -32,20 +29,29 @@ public interface LogErrMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<LogErr> request, @Param("token") Token token);
long insertBatch(@Param("list") List<LogErr> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") LogErrDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface LogErrMapper {
* @param token
* @return
*/
long update(@Param("request") LogErrUpdateRequest request, @Param("token") Token token);
long update(@Param("request") LogErr request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface LogErrMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
LogErr getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
LogErr get(@Param("request") LogErrGetRequest request, @Param("token") Token token);
List<LogErr> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,21 +1,18 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.Profiles;
import ${basePackage}.module.system.req.ProfilesDeleteRequest;
import ${basePackage}.module.system.req.ProfilesFindRequest;
import ${basePackage}.module.system.req.ProfilesGetRequest;
import ${basePackage}.module.system.req.ProfilesUpdateRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Profiles;
import xyz.wbsite.module.system.req.ProfilesFindRequest;
import java.util.List;
/**
* PROFILES -
*
* @author author
* @date 2020-05-24
* @author wangbing
* @since 2020-06-27
*/
@Mapper
public interface ProfilesMapper {
@ -32,20 +29,29 @@ public interface ProfilesMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Profiles> request, @Param("token") Token token);
long insertBatch(@Param("list") List<Profiles> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") ProfilesDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface ProfilesMapper {
* @param token
* @return
*/
long update(@Param("request") ProfilesUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Profiles request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface ProfilesMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Profiles getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Profiles get(@Param("request") ProfilesGetRequest request, @Param("token") Token token);
List<Profiles> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,14 +1,11 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.Res;
import ${basePackage}.module.system.req.ResDeleteRequest;
import ${basePackage}.module.system.req.ResFindRequest;
import ${basePackage}.module.system.req.ResGetRequest;
import ${basePackage}.module.system.req.ResLoadRequest;
import ${basePackage}.module.system.req.ResUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Res;
import xyz.wbsite.module.system.req.ResFindRequest;
import xyz.wbsite.module.system.req.ResLoadRequest;
import java.util.List;
@ -16,7 +13,7 @@ import java.util.List;
* RES -
*
* @author wangbing
* @date 2020-01-05
* @since 2020-06-27
*/
@Mapper
public interface ResMapper {
@ -33,20 +30,29 @@ public interface ResMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Res> request, @Param("token") Token token);
long insertBatch(@Param("list") List<Res> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("request") ResDeleteRequest request, @Param("token") Token token);
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -55,7 +61,7 @@ public interface ResMapper {
* @param token
* @return
*/
long update(@Param("request") ResUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Res request, @Param("token") Token token);
/**
*
@ -67,20 +73,30 @@ public interface ResMapper {
List<Res> find(@Param("request") ResFindRequest request, @Param("token") Token token);
/**
*
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
List<Res> load(@Param("request") ResLoadRequest request, @Param("token") Token token);
Res getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
List<Res> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @return
*/
Res get(@Param("request") ResGetRequest request, @Param("token") Token token);
List<Res> load(@Param("request") ResLoadRequest request, @Param("token") Token token);
}

@ -1,13 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.Role;
import ${basePackage}.module.system.req.RoleDeleteRequest;
import ${basePackage}.module.system.req.RoleFindRequest;
import ${basePackage}.module.system.req.RoleGetRequest;
import ${basePackage}.module.system.req.RoleUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Role;
import xyz.wbsite.module.system.req.RoleFindRequest;
import java.util.List;
@ -15,7 +12,7 @@ import java.util.List;
* ROLE -
*
* @author wangbing
* @date 2019-12-20
* @since 2020-06-27
*/
@Mapper
public interface RoleMapper {
@ -32,20 +29,29 @@ public interface RoleMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Role> request, @Param("token") Token token);
long insertBatch(@Param("list") List<Role> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") RoleDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface RoleMapper {
* @param token
* @return
*/
long update(@Param("request") RoleUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Role request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface RoleMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Role getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Role get(@Param("request") RoleGetRequest request, @Param("token") Token token);
List<Role> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,23 +1,18 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.RoleRes;
import xyz.wbsite.module.system.req.RoleResFindRequest;
import java.util.List;
import ${basePackage}.module.system.ent.RoleRes;
import ${basePackage}.module.system.req.RoleResCreateRequest;
import ${basePackage}.module.system.req.RoleResDeleteRequest;
import ${basePackage}.module.system.req.RoleResFindRequest;
import ${basePackage}.module.system.req.RoleResGetRequest;
import ${basePackage}.module.system.req.RoleResUpdateRequest;
import ${basePackage}.frame.auth.Token;
/**
* ROLE_RES -
*
* @author wangbing
* @date 2020-01-05
* @since 2020-06-27
*/
@Mapper
public interface RoleResMapper {
@ -34,20 +29,29 @@ public interface RoleResMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<RoleRes> request, @Param("token") Token token);
long insertBatch(@Param("list") List<RoleRes> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") RoleResDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -56,7 +60,7 @@ public interface RoleResMapper {
* @param token
* @return
*/
long update(@Param("request") RoleResUpdateRequest request, @Param("token") Token token);
long update(@Param("request") RoleRes request, @Param("token") Token token);
/**
*
@ -70,9 +74,18 @@ public interface RoleResMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
RoleRes getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
RoleRes get(@Param("request") RoleResGetRequest request, @Param("token") Token token);
List<RoleRes> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -45,12 +45,6 @@
<if test="request.date != null and request.date != ''">
AND "DATE" = ${r'#'}{request.date}
</if>
<if test="request.startDate != null">
AND strftime('%s',"CREATE_TIME", 'utc')*1000 &gt;= ${r'#'}{request.startDate}
</if>
<if test="request.endDate != null">
AND strftime('%s',"CREATE_TIME", 'utc')*1000 &lt;= ${r'#'}{request.endDate}
</if>
</select>
<select id="search" resultMap="sequence">

@ -4,7 +4,7 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Sequence;
import xyz.wbsite.module.system.req.SequenceGetRequest;
import xyz.wbsite.module.system.req.SequenceFindRequest;
import java.util.List;
@ -12,7 +12,7 @@ import java.util.List;
* SEQUENCE -
*
* @author wangbing
* @date 2020-06-25
* @since 2020-06-27
*/
@Mapper
public interface SequenceMapper {
@ -29,11 +29,29 @@ public interface SequenceMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Sequence> list, @Param("token") Token token);
/**
*
*
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Sequence> request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -51,14 +69,23 @@ public interface SequenceMapper {
* @param token
* @return
*/
List<Sequence> find(@Param("request") Sequence request, @Param("token") Token token);
List<Sequence> find(@Param("request") SequenceFindRequest request, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Sequence getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Sequence get(@Param("request") SequenceGetRequest request, @Param("token") Token token);
List<Sequence> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,21 +1,18 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.TaskSql;
import ${basePackage}.module.system.req.TaskSqlDeleteRequest;
import ${basePackage}.module.system.req.TaskSqlFindRequest;
import ${basePackage}.module.system.req.TaskSqlGetRequest;
import ${basePackage}.module.system.req.TaskSqlUpdateRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.TaskSql;
import xyz.wbsite.module.system.req.TaskSqlFindRequest;
import java.util.List;
/**
* TASK_SQL - SQL
*
* @author author
* @date 2020-05-24
* @author wangbing
* @since 2020-06-27
*/
@Mapper
public interface TaskSqlMapper {
@ -32,20 +29,29 @@ public interface TaskSqlMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<TaskSql> request, @Param("token") Token token);
long insertBatch(@Param("list") List<TaskSql> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") TaskSqlDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface TaskSqlMapper {
* @param token
* @return
*/
long update(@Param("request") TaskSqlUpdateRequest request, @Param("token") Token token);
long update(@Param("request") TaskSql request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface TaskSqlMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
TaskSql getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
TaskSql get(@Param("request") TaskSqlGetRequest request, @Param("token") Token token);
List<TaskSql> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,21 +1,18 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.Tokens;
import ${basePackage}.module.system.req.TokensDeleteRequest;
import ${basePackage}.module.system.req.TokensFindRequest;
import ${basePackage}.module.system.req.TokensGetRequest;
import ${basePackage}.module.system.req.TokensUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Tokens;
import xyz.wbsite.module.system.req.TokensFindRequest;
import java.util.List;
/**
* TOKENS -
*
* @author author
* @date 2019-12-19
* @author wangbing
* @since 2020-06-27
*/
@Mapper
public interface TokensMapper {
@ -32,20 +29,29 @@ public interface TokensMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Tokens> request, @Param("token") Token token);
long insertBatch(@Param("list") List<Tokens> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") TokensDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface TokensMapper {
* @param token
* @return
*/
long update(@Param("request") TokensUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Tokens request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface TokensMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Tokens getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Tokens get(@Param("request") TokensGetRequest request, @Param("token") Token token);
List<Tokens> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,13 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.User;
import ${basePackage}.module.system.req.UserDeleteRequest;
import ${basePackage}.module.system.req.UserFindRequest;
import ${basePackage}.module.system.req.UserGetRequest;
import ${basePackage}.module.system.req.UserUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.User;
import xyz.wbsite.module.system.req.UserFindRequest;
import java.util.List;
@ -15,7 +12,7 @@ import java.util.List;
* USER -
*
* @author wangbing
* @date 2019-12-20
* @since 2020-06-27
*/
@Mapper
public interface UserMapper {
@ -32,20 +29,29 @@ public interface UserMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<User> request, @Param("token") Token token);
long insertBatch(@Param("list") List<User> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") UserDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface UserMapper {
* @param token
* @return
*/
long update(@Param("request") UserUpdateRequest request, @Param("token") Token token);
long update(@Param("request") User request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface UserMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
User getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
User get(@Param("request") UserGetRequest request, @Param("token") Token token);
List<User> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,13 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.UserRole;
import ${basePackage}.module.system.req.UserRoleDeleteRequest;
import ${basePackage}.module.system.req.UserRoleFindRequest;
import ${basePackage}.module.system.req.UserRoleGetRequest;
import ${basePackage}.module.system.req.UserRoleUpdateRequest;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.UserRole;
import xyz.wbsite.module.system.req.UserRoleFindRequest;
import java.util.List;
@ -15,7 +12,7 @@ import java.util.List;
* USER_ROLE -
*
* @author wangbing
* @date 2019-12-20
* @since 2020-06-27
*/
@Mapper
public interface UserRoleMapper {
@ -32,20 +29,29 @@ public interface UserRoleMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<UserRole> request, @Param("token") Token token);
long insertBatch(@Param("list") List<UserRole> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") UserRoleDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -54,7 +60,7 @@ public interface UserRoleMapper {
* @param token
* @return
*/
long update(@Param("request") UserRoleUpdateRequest request, @Param("token") Token token);
long update(@Param("request") UserRole request, @Param("token") Token token);
/**
*
@ -68,9 +74,18 @@ public interface UserRoleMapper {
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
UserRole getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
UserRole get(@Param("request") UserRoleGetRequest request, @Param("token") Token token);
List<UserRole> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,9 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.Visitor;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.Visitor;
import xyz.wbsite.module.system.req.VisitorFindRequest;
import java.util.List;
@ -11,7 +12,7 @@ import java.util.List;
* VISITOR -
*
* @author wangbing
* @date 2020-06-25
* @since 2020-06-27
*/
@Mapper
public interface VisitorMapper {
@ -28,20 +29,29 @@ public interface VisitorMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<Visitor> request, @Param("token") Token token);
long insertBatch(@Param("list") List<Visitor> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") ${basePackage}.module.system.req.VisitorDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -50,7 +60,7 @@ public interface VisitorMapper {
* @param token
* @return
*/
long update(@Param("request") ${basePackage}.module.system.req.VisitorUpdateRequest request, @Param("token") Token token);
long update(@Param("request") Visitor request, @Param("token") Token token);
/**
*
@ -59,14 +69,23 @@ public interface VisitorMapper {
* @param token
* @return
*/
List<Visitor> find(@Param("request") ${basePackage}.module.system.req.VisitorFindRequest request, @Param("token") Token token);
List<Visitor> find(@Param("request") VisitorFindRequest request, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
Visitor getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
Visitor get(@Param("request") ${basePackage}.module.system.req.VisitorGetRequest request, @Param("token") Token token);
List<Visitor> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -1,9 +1,10 @@
package ${basePackage}.module.system.mpr;
package xyz.wbsite.module.system.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${basePackage}.frame.auth.Token;
import ${basePackage}.module.system.ent.VisitorRes;
import xyz.wbsite.frame.auth.Token;
import xyz.wbsite.module.system.ent.VisitorRes;
import xyz.wbsite.module.system.req.VisitorResFindRequest;
import java.util.List;
@ -11,7 +12,7 @@ import java.util.List;
* VISITOR_RES -
*
* @author wangbing
* @date 2020-06-25
* @since 2020-06-27
*/
@Mapper
public interface VisitorResMapper {
@ -28,20 +29,29 @@ public interface VisitorResMapper {
/**
*
*
* @param request
* @param token
* @param list
* @param token
* @return
*/
long insertBatch(@Param("list") List<VisitorRes> request, @Param("token") Token token);
long insertBatch(@Param("list") List<VisitorRes> list, @Param("token") Token token);
/**
*
*
* @param request
* @param token
* @param id
* @param token
* @return
*/
long delete(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
long delete(@Param("request") ${basePackage}.module.system.req.VisitorResDeleteRequest request, @Param("token") Token token);
long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
/**
*
@ -50,7 +60,7 @@ public interface VisitorResMapper {
* @param token
* @return
*/
long update(@Param("request") ${basePackage}.module.system.req.VisitorResUpdateRequest request, @Param("token") Token token);
long update(@Param("request") VisitorRes request, @Param("token") Token token);
/**
*
@ -59,5 +69,23 @@ public interface VisitorResMapper {
* @param token
* @return
*/
List<VisitorRes> find(@Param("request") ${basePackage}.module.system.req.VisitorResFindRequest request, @Param("token") Token token);
List<VisitorRes> find(@Param("request") VisitorResFindRequest request, @Param("token") Token token);
/**
*
*
* @param id
* @param token
* @return
*/
VisitorRes getById(@Param("id") Long id, @Param("token") Token token);
/**
*
*
* @param list
* @param token
* @return
*/
List<VisitorRes> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
}

@ -0,0 +1,93 @@
package xyz.wbsite.module.system.req;
import xyz.wbsite.frame.base.BaseFindRequest;
import java.util.Date;
/**
* SequenceFindRequest -
*
* @author wangbing
* @version 0.0.1
* @since 2020-06-27
*/
public class SequenceFindRequest extends BaseFindRequest {
/**
* .
*/
private String seqName;
/**
* .
*/
private String year;
/**
* .
*/
private String month;
/**
* .
*/
private String date;
/**
*
*/
private Date startDate;
/**
*
*/
private Date endDate;
public String getSeqName() {
return this.seqName;
}
public void setSeqName(String seqName) {
this.seqName = seqName;
}
public String getYear() {
return this.year;
}
public void setYear(String year) {
this.year = year;
}
public String getMonth() {
return this.month;
}
public void setMonth(String month) {
this.month = month;
}
public String getDate() {
return this.date;
}
public void setDate(String date) {
this.date = date;
}
public Date getStartDate() {
return startDate;
}
public void setStartDate(Date startDate) {
this.startDate = startDate;
}
public Date getEndDate() {
return endDate;
}
public void setEndDate(Date endDate) {
this.endDate = endDate;
}
}

@ -0,0 +1,14 @@
package xyz.wbsite.module.system.rsp;
import xyz.wbsite.frame.base.BaseFindResponse;
import xyz.wbsite.module.system.ent.Sequence;
/**
* SequenceFindResponse -
*
* @author wangbing
* @version 0.0.1
* @since 2020-06-27
*/
public class SequenceFindResponse extends BaseFindResponse<Sequence> {
}

@ -1,4 +1,4 @@
package modules.SpringBoot.test.system;
package ${basePackage}.system;
import org.junit.Test;
import org.junit.runner.RunWith;

Loading…
Cancel
Save

Powered by TurnKey Linux.