Merge branch 'master' of https://gitee.ltd/pigx/pigx
This commit is contained in:
冷冷 committed
commit
5f2e9bf5cd
31 files changed
+79
-81
No files matched your search
+3
-3
@@ -27,7 +27,7 @@ import com.pig4cloud.pigx.act.dto.TaskDTO;
|
||||
import com.pig4cloud.pigx.act.entity.LeaveBill;
|
||||
import com.pig4cloud.pigx.act.mapper.LeaveBillMapper;
|
||||
import com.pig4cloud.pigx.act.service.ActTaskService;
|
||||
import com.pig4cloud.pigx.common.core.constant.PaginationConstant;
|
||||
import com.pig4cloud.pigx.common.core.constant.PaginationConstants;
|
||||
import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum;
|
||||
import com.pig4cloud.pigx.common.core.util.TenantContextHolder;
|
||||
import com.pig4cloud.pigx.common.security.util.SecurityUtils;
|
||||
@@ -72,8 +72,8 @@ public class ActTaskServiceImpl implements ActTaskService {
|
||||
|
||||
@Override
|
||||
public IPage getTaskByName(Map<String, Object> params, String name) {
|
||||
int page = MapUtil.getInt(params, PaginationConstant.CURRENT);
|
||||
int limit = MapUtil.getInt(params, PaginationConstant.SIZE);
|
||||
int page = MapUtil.getInt(params, PaginationConstants.CURRENT);
|
||||
int limit = MapUtil.getInt(params, PaginationConstants.SIZE);
|
||||
|
||||
TaskQuery taskQuery = taskService.createTaskQuery()
|
||||
.taskCandidateOrAssigned(name)
|
||||
|
||||
+3
-3
@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||
import com.pig4cloud.pigx.act.service.ModelService;
|
||||
import com.pig4cloud.pigx.common.core.constant.PaginationConstant;
|
||||
import com.pig4cloud.pigx.common.core.constant.PaginationConstants;
|
||||
import com.pig4cloud.pigx.common.core.constant.SecurityConstants;
|
||||
import com.pig4cloud.pigx.common.core.util.TenantContextHolder;
|
||||
import lombok.AllArgsConstructor;
|
||||
@@ -117,8 +117,8 @@ public class ModelServiceImpl implements ModelService {
|
||||
modelQuery.modelCategory(category);
|
||||
}
|
||||
|
||||
int page = MapUtil.getInt(params, PaginationConstant.CURRENT);
|
||||
int limit = MapUtil.getInt(params, PaginationConstant.SIZE);
|
||||
int page = MapUtil.getInt(params, PaginationConstants.CURRENT);
|
||||
int limit = MapUtil.getInt(params, PaginationConstants.SIZE);
|
||||
|
||||
IPage result = new Page(page, limit);
|
||||
result.setTotal(modelQuery.count());
|
||||
|
||||
+3
-3
@@ -25,7 +25,7 @@ import com.pig4cloud.pigx.act.dto.ProcessDefDTO;
|
||||
import com.pig4cloud.pigx.act.entity.LeaveBill;
|
||||
import com.pig4cloud.pigx.act.mapper.LeaveBillMapper;
|
||||
import com.pig4cloud.pigx.act.service.ProcessService;
|
||||
import com.pig4cloud.pigx.common.core.constant.PaginationConstant;
|
||||
import com.pig4cloud.pigx.common.core.constant.PaginationConstants;
|
||||
import com.pig4cloud.pigx.common.core.constant.enums.ProcessStatusEnum;
|
||||
import com.pig4cloud.pigx.common.core.constant.enums.ResourceTypeEnum;
|
||||
import com.pig4cloud.pigx.common.core.constant.enums.TaskStatusEnum;
|
||||
@@ -72,8 +72,8 @@ public class ProcessServiceImpl implements ProcessService {
|
||||
query.processDefinitionCategory(category);
|
||||
}
|
||||
|
||||
int page = MapUtil.getInt(params, PaginationConstant.CURRENT);
|
||||
int limit = MapUtil.getInt(params, PaginationConstant.SIZE);
|
||||
int page = MapUtil.getInt(params, PaginationConstants.CURRENT);
|
||||
int limit = MapUtil.getInt(params, PaginationConstants.SIZE);
|
||||
|
||||
IPage result = new Page(page, limit);
|
||||
result.setTotal(query.count());
|
||||
|
||||
+6
-6
@@ -24,7 +24,7 @@ import cn.hutool.core.util.StrUtil;
|
||||
import com.pig4cloud.pigx.codegen.entity.ColumnEntity;
|
||||
import com.pig4cloud.pigx.codegen.entity.GenConfig;
|
||||
import com.pig4cloud.pigx.codegen.entity.TableEntity;
|
||||
import com.pig4cloud.pigx.common.core.constant.CommonConstant;
|
||||
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
|
||||
import com.pig4cloud.pigx.common.core.exception.CheckedException;
|
||||
import lombok.experimental.UtilityClass;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -242,7 +242,7 @@ public class GenUtils {
|
||||
* 获取文件名
|
||||
*/
|
||||
private String getFileName(String template, String className, String packageName, String moduleName) {
|
||||
String packagePath = CommonConstant.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator;
|
||||
String packagePath = CommonConstants.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator;
|
||||
if (StringUtils.isNotBlank(packageName)) {
|
||||
packagePath += packageName.replace(".", File.separator) + File.separator + moduleName + File.separator;
|
||||
}
|
||||
@@ -268,7 +268,7 @@ public class GenUtils {
|
||||
}
|
||||
|
||||
if (template.contains(MAPPER_XML_VM)) {
|
||||
return CommonConstant.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
|
||||
return CommonConstants.BACK_END_PROJECT + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + "mapper" + File.separator + className + "Mapper.xml";
|
||||
}
|
||||
|
||||
if (template.contains(MENU_SQL_VM)) {
|
||||
@@ -276,16 +276,16 @@ public class GenUtils {
|
||||
}
|
||||
|
||||
if (template.contains(INDEX_VUE_VM)) {
|
||||
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "views" +
|
||||
return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "views" +
|
||||
File.separator + moduleName + File.separator + className.toLowerCase() + File.separator + "index.vue";
|
||||
}
|
||||
|
||||
if (template.contains(API_JS_VM)) {
|
||||
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js";
|
||||
return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "api" + File.separator + className.toLowerCase() + ".js";
|
||||
}
|
||||
|
||||
if (template.contains(CRUD_JS_VM)) {
|
||||
return CommonConstant.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" +
|
||||
return CommonConstants.FRONT_END_PROJECT + File.separator + "src" + File.separator + "const" +
|
||||
File.separator + "crud" + File.separator + className.toLowerCase() + ".js";
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@
|
||||
|
||||
package com.pig4cloud.pigx.monitor.support;
|
||||
|
||||
import com.pig4cloud.pigx.common.core.constant.CommonConstant;
|
||||
import com.pig4cloud.pigx.common.core.constant.CommonConstants;
|
||||
import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
|
||||
import de.codecentric.boot.admin.server.eventstore.InMemoryEventStore;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@@ -48,7 +48,7 @@ public class RedisEventStore extends InMemoryEventStore {
|
||||
String key = event.getInstance().getValue() + "_" + event.getTimestamp().toString();
|
||||
log.info("保存实例事件的KEY：{},EVENT: {}", key, event.getType());
|
||||
redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(InstanceEvent.class));
|
||||
redisTemplate.opsForHash().put(CommonConstant.EVENT_KEY, key, event);
|
||||
redisTemplate.opsForHash().put(CommonConstants.EVENT_KEY, key, event);
|
||||
});
|
||||
return super.append(events);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user