Skip to content

Y
yzg-util
Commit 170c48f0 authored by yanzg's avatar yanzg
Browse files
Options

Merge remote-tracking branch 'origin/ver1.1' into ver1.1

parents 216dccec e9f83766
Show whitespace changes
Inline Side-by-side
Showing with 572 additions and 279 deletions
yzg-util-base/src/main/java/com/yanzuoguang/util/YzgError.java
View file @ 170c48f0
......@@ -3,6 +3,8 @@ package com.yanzuoguang.util;
import com.yanzuoguang.util.exception.CodeException;
import com.yanzuoguang.util.exception.RuntimeCodeException;
import java.util.function.Consumer;
/**
* 系统错误编码
*
......@@ -10,184 +12,154 @@ import com.yanzuoguang.util.exception.RuntimeCodeException;
*/
public class YzgError {
private static final YzgErrorData error = new YzgErrorData("999.");
private static final YzgErrorData ERROR = new YzgErrorData("999.");
private static void init() {
error.add("000", "%s");
error.add("001", "该页面未绑定表");
error.add("002", "类%s未发现表结构");
error.add("003", "类%s未发现SQL语句%s");
error.add("004", "泛型继承检测错误");
error.add("005", "视频文件不存在");
error.add("006", "对象%s不能复制");
error.add("007", "整形转换成字节的PCD码必须小于100");
error.add("008", "不能识别文件类型%s");
error.add("009", "文件类型不为图片、音频、视频");
error.add("010", "文件%s已存在文件，不能创建目录");
error.add("011", "创建文件夹失败");
error.add("012", "文件[%s]删除失败");
error.add("013", "变量名%s不支持");
error.add("014", "正则表达式错误");
error.add("015", "长度参数为错误，必须大于0，此参数为 [%s]");
error.add("016", "随机码，基本数据为空。");
error.add("017", "生成时间搓 MD5 ID 时，时间不能为空");
error.add("018", "压缩时文件夹对象不能为空。");
error.add("019", "[%s]不是一个文件夹,或者不存在。");
error.add("020", "删除文件[%s]失败");
error.add("021", "文件%s不存在");
error.add("022", "没有抛出异常");
error.add("023", "上下文获取失败");
error.add("024", "导出时请传入配置信息");
error.add("025", "不能处理非本条件的字段");
error.add("026", "代码片段%s:%s:%s为单数");
error.add("027", "SqlCondItem不支持输入参数，必须带代码片段");
error.add("028", "需要格式化的字符串不支持");
error.add("029", "表%s主键值为空时不能更新");
error.add("030", "修改失败，请确认是否被其他人修改,版本号传入是否正确");
error.add("031", "统计类型[%s]不支持");
error.add("032", "SQL语句%s不存在纬度%s");
error.add("033", "表中未包含MD5字段");
error.add("034", "Excel已初始化");
error.add("035", "保存失败");
error.add("036", "保存路径%s失败");
error.add("037", "%s失败,该数据可能已被修改");
error.add("038", "size请在0~1之间");
error.add("039", "视频转码压缩时文件不存在:%s");
error.add("040", "audioBitRateZip请在0~1之间");
error.add("041", "videoSizeZip请在0~1之间");
error.add("042", "videoBitRateZip请在0~1之间");
error.add("043", "你需要格式化的字符串格式为空");
error.add("044", "不能获取文件Mime类型%s");
error.add("045", "下载失败[%s]");
error.add("046", "创建对象%s出错");
error.add("047", "不能识别模板[%s]");
error.add("048", "获取视频所缩类图失败:%s");
error.add("049", "没有找到%s的数据");
error.add("050", "地区编码不合法，长度不为9");
error.add("051", "地区编码不合法，长度大于9");
error.add("052", "获取百度接口日期失败");
error.add("053", "获取百度日期正则表达式失败");
error.add("054", "获取百度日期返回错误状态:%s");
error.add("055", "获取百度日期数据格式已修改");
error.add("056", "解密失败:%s");
error.add("057", "请配置yzg.upload.server");
error.add("058", "请配置yzg.upload.display");
error.add("059", "Cookies缺少[%s]");
error.add("060", "名称不能为空");
error.add("061", "请先登录");
error.add("062", "请上传文件");
error.add("063", "文件[%s]保存失败");
error.add("064", "文件[%s]不存在");
error.add("065", "文件[%s]是目录");
error.add("066", "请传入需要移动的文件");
error.add("067", "移动来源路径不能为空");
error.add("068", "移动目标路径不能为空");
error.add("069", "不能用文件 %s 覆盖文件夹 %s");
error.add("070", "移动文件 %s 到 %s 失败,原因:%s");
error.add("071", "来源文件不存在");
error.add("072", "来源文件不为视频");
error.add("073", "获取视频缩略图失败");
error.add("074", "请传入%s文件");
error.add("075", "文件夹不能包含两个.");
error.add("076", "文件夹不能包含\\u");
error.add("077", "队列 %s 不存在");
error.add("078", "交换器 %s 不存在");
error.add("079", "算法错误");
error.add("080", "当前队列没有消息");
error.add("081", "消息队列%s消息%s已经执行");
error.add("082", "请传入queue和messageId");
error.add("083", "%s");
error.add("084", "%s");
error.add("085", "%s %s");
}
private static void initTemp() {
ERROR.add("000", "%s");
ERROR.add("001", "该页面未绑定表");
ERROR.add("002", "类%s未发现表结构");
ERROR.add("003", "类%s未发现SQL语句%s");
ERROR.add("004", "泛型继承检测错误");
ERROR.add("005", "视频文件不存在");
ERROR.add("006", "对象%s不能复制");
ERROR.add("007", "整形转换成字节的PCD码必须小于100");
ERROR.add("008", "不能识别文件类型%s");
ERROR.add("009", "文件类型不为图片、音频、视频");
ERROR.add("010", "文件%s已存在文件，不能创建目录");
ERROR.add("011", "创建文件夹失败");
ERROR.add("012", "文件[%s]删除失败");
ERROR.add("013", "变量名%s不支持");
ERROR.add("014", "正则表达式错误");
ERROR.add("015", "长度参数为错误，必须大于0，此参数为 [%s]");
ERROR.add("016", "随机码，基本数据为空。");
ERROR.add("017", "生成时间搓 MD5 ID 时，时间不能为空");
ERROR.add("018", "压缩时文件夹对象不能为空。");
ERROR.add("019", "[%s]不是一个文件夹,或者不存在。");
ERROR.add("020", "删除文件[%s]失败");
ERROR.add("021", "文件%s不存在");
ERROR.add("022", "没有抛出异常");
ERROR.add("023", "上下文获取失败");
ERROR.add("024", "导出时请传入配置信息");
ERROR.add("025", "不能处理非本条件的字段");
ERROR.add("026", "代码片段%s:%s:%s为单数");
ERROR.add("027", "SqlCondItem不支持输入参数，必须带代码片段");
ERROR.add("028", "需要格式化的字符串不支持");
ERROR.add("029", "表%s主键值为空时不能更新");
ERROR.add("030", "修改失败，请确认是否被其他人修改,版本号传入是否正确");
ERROR.add("031", "统计类型[%s]不支持");
ERROR.add("032", "SQL语句%s不存在纬度%s");
ERROR.add("033", "表中未包含MD5字段");
ERROR.add("034", "Excel已初始化");
ERROR.add("035", "保存失败");
ERROR.add("036", "保存路径%s失败");
ERROR.add("037", "%s失败,该数据可能已被修改");
ERROR.add("038", "size请在0~1之间");
ERROR.add("039", "视频转码压缩时文件不存在:%s");
ERROR.add("040", "audioBitRateZip请在0~1之间");
ERROR.add("041", "videoSizeZip请在0~1之间");
ERROR.add("042", "videoBitRateZip请在0~1之间");
ERROR.add("043", "你需要格式化的字符串格式为空");
ERROR.add("044", "不能获取文件Mime类型%s");
ERROR.add("045", "下载失败[%s]");
ERROR.add("046", "创建对象%s出错");
ERROR.add("047", "不能识别模板[%s]");
ERROR.add("048", "获取视频所缩类图失败:%s");
ERROR.add("049", "没有找到%s的数据");
ERROR.add("050", "地区编码不合法，长度不为9");
ERROR.add("051", "地区编码不合法，长度大于9");
ERROR.add("052", "获取百度接口日期失败");
ERROR.add("053", "获取百度日期正则表达式失败");
ERROR.add("054", "获取百度日期返回错误状态:%s");
ERROR.add("055", "获取百度日期数据格式已修改");
ERROR.add("056", "解密失败:%s");
ERROR.add("057", "请配置yzg.upload.server");
ERROR.add("058", "请配置yzg.upload.display");
ERROR.add("059", "Cookies缺少[%s]");
ERROR.add("060", "名称不能为空");
ERROR.add("061", "请先登录");
ERROR.add("062", "请上传文件");
ERROR.add("063", "文件[%s]保存失败,保存路径为:%s");
ERROR.add("064", "文件[%s]不存在");
ERROR.add("065", "文件[%s]是目录");
ERROR.add("066", "请传入需要移动的文件");
ERROR.add("067", "移动来源路径不能为空");
ERROR.add("068", "移动目标路径不能为空");
ERROR.add("069", "不能用文件 %s 覆盖文件夹 %s");
ERROR.add("070", "移动文件 %s 到 %s 失败,原因:%s");
ERROR.add("071", "来源文件不存在");
ERROR.add("072", "来源文件不为视频");
ERROR.add("073", "获取视频缩略图失败");
ERROR.add("074", "请传入%s文件");
ERROR.add("075", "文件夹不能包含两个.");
ERROR.add("076", "文件夹不能包含\\u");
ERROR.add("077", "队列 %s 不存在");
ERROR.add("078", "交换器 %s 不存在");
ERROR.add("079", "算法错误");
ERROR.add("080", "当前队列没有消息");
ERROR.add("081", "消息队列%s消息%s已经执行");
ERROR.add("082", "请传入queue和messageId");
ERROR.add("083", "%s");
ERROR.add("084", "%s");
ERROR.add("085", "%s %s");
}
/**
* 抛出异常
* 注册错误消息
*
* @param code
* @param args
* @param callback 回调处理错误消息
*/
public static CodeException throwException(String code, Object... args) {
throw error.getCodeException(null, code, args);
public static void register(Consumer<YzgErrorData> callback) {
if (callback == null) {
return;
}
/**
* 抛出异常
*
* @param code
* @param args
*/
public static CodeException throwException(Throwable ex, String code, Object... args) {
throw error.getCodeException(ex, code, args);
callback.accept(ERROR);
}
/**
* 抛出异常
*
* @param code
* @param args
* @param code 错误码
* @param args 错误参数
* @return 异常信息
*/
public static CodeException getException(String code, Object... args) {
return error.getCodeException(null, code, args);
return ERROR.getCodeException(null, code, args);
}
/**
* 抛出异常
*
* @param code
* @param args
* @param code 错误码
* @param args 错误参数
* @return 异常信息
*/
public static CodeException getException(Throwable ex, String code, Object... args) {
return error.getCodeException(ex, code, args);
return ERROR.getCodeException(ex, code, args);
}
/**
* 抛出异常
*
* @param code
* @param args
*/
public static RuntimeCodeException throwRuntimeException(String code, Object... args) {
throw error.getRuntimeException(null, code, args);
}
/**
* 抛出异常
*
* @param code
* @param args
*/
public static RuntimeCodeException throwRuntimeException(Throwable ex, String code, Object... args) {
throw error.getRuntimeException(ex, code, args);
}
/**
* 抛出异常
*
* @param code
* @param args
* @param code 错误码
* @param args 错误参数
* @return 异常信息
*/
public static RuntimeCodeException getRuntimeException(String code, Object... args) {
return error.getRuntimeException(null, code, args);
return ERROR.getRuntimeException(null, code, args);
}
/**
* 抛出异常
*
* @param code
* @param args
* @param code 错误码
* @param args 错误参数
* @return 异常信息
*/
public static RuntimeCodeException getRuntimeException(Throwable ex, String code, Object... args) {
return error.getRuntimeException(ex, code, args);
return ERROR.getRuntimeException(ex, code, args);
}
static {
init();
initTemp();
}
}
yzg-util-base/src/main/java/com/yanzuoguang/util/helper/ArrayHelper.java
View file @ 170c48f0
......@@ -29,6 +29,9 @@ public class ArrayHelper {
return tos;
}
for (Collection<T> list : froms) {
if (list == null) {
continue;
}
for (T item : list) {
if (!StringHelper.isEmpty(item)) {
tos.add(item);
......
yzg-util-base/src/main/java/com/yanzuoguang/util/helper/MapHelper.java
View file @ 170c48f0
......@@ -5,23 +5,41 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 映射处理
*
* @author 颜佐光
*/
public class MapHelper {
/**
* 将一个对象列表转换为HashMap
*
* @param list 需要转换的列表
* @param <T>
* @return
* @param <T> 泛型
* @return 泛型处理
*/
public static <T extends MapKey> Map<String, T> getMap(List<T> list) {
Map<String, T> map = new HashMap<>();
if (list != null) {
public static <T extends MapKey<T>> Map<String, T> getMap(List<T> list) {
return getMap(list, (item) -> item.getKey(item));
}
/**
* 将一个对象列表转换为HashMap
*
* @param list 需要转换的列表
* @param proxy 获取主键的函数
* @param <T> 泛型
* @return 泛型处理
*/
public static <T extends Object> Map<String, T> getMap(List<T> list, MapKey<T> proxy) {
if (list == null) {
return new HashMap<>(0);
}
Map<String, T> map = new HashMap<>(list.size());
for (T item : list) {
String key = item.getKey(item);
String key = proxy.getKey(item);
map.put(key, item);
}
}
return map;
}
......@@ -30,17 +48,19 @@ public class MapHelper {
*
* @param list 需要转换的列表
* @param proxy 获取主键的函数
* @param <T>
* @return
* @param <T> 类型
* @param <M> 关键字类型
* @return 映射结果
*/
public static <T extends Object> Map<String, T> getMap(List<T> list, MapKey<T> proxy) {
Map<String, T> map = new HashMap<>();
if (list != null) {
public static <T, M> Map<M, T> getMapType(List<T> list, MapKeyType<T, M> proxy) {
if (list == null) {
return new HashMap<>(0);
}
Map<M, T> map = new HashMap<>(list.size());
for (T item : list) {
String key = proxy.getKey(item);
M key = proxy.getKey(item);
map.put(key, item);
}
}
return map;
}
......@@ -48,19 +68,20 @@ public class MapHelper {
* 将一个对象列表转换为HashMap
*
* @param list 需要转换的列表
* @param <T>
* @return
* @param <T> 泛型
* @return 泛型处理
*/
public static <T extends MapKey> List<String> getKeys(List<T> list) {
List<String> to = new ArrayList<>();
if (list != null) {
public static <T extends MapKey<T>> List<String> getKeys(List<T> list) {
if (list == null) {
return new ArrayList<>();
}
List<String> to = new ArrayList<>(list.size());
for (T item : list) {
String key = item.getKey(item);
if (!to.contains(key)) {
to.add(key);
}
}
}
return to;
}
......@@ -69,8 +90,8 @@ public class MapHelper {
*
* @param list 需要转换的列表
* @param proxy 获取主键的函数
* @param <T>
* @return
* @param <T> 泛型
* @return 泛型处理
*/
public static <T extends Object> List<String> getKeys(List<T> list, MapKey<T> proxy) {
List<String> to = new ArrayList<>();
......@@ -85,24 +106,15 @@ public class MapHelper {
return to;
}
/**
* 一个获取对象关键字的处理函数
*
* @param <T>
*/
public interface MapKey<T> {
String getKey(T from);
}
/**
* 将建添加到子数组中
*
* @param mapList
* @param key
* @param item
* @param <T>
* @param <M>
* @return
* @param mapList 列表
* @param key 关键字
* @param item 对象
* @param <T> 关键字类型
* @param <M> 关键字对象
* @return 最终结果
*/
public static <T, M> List<M> addMapList(Map<T, List<M>> mapList, T key, M item) {
if (!mapList.containsKey(key)) {
......@@ -112,4 +124,28 @@ public class MapHelper {
ret.add(item);
return ret;
}
/**
* 一个获取对象关键字的处理函数
*
* @param <T> 泛型
*/
public interface MapKey<T> extends MapKeyType<T, String> {
}
/**
* 一个获取对象关键字的处理函数
*
* @param <T> 泛型
* @param <M> 泛型
*/
public interface MapKeyType<T, M> {
/**
* 获取关键字
*
* @param from 来源数据
* @return 关键字
*/
M getKey(T from);
}
}
yzg-util-base/src/main/java/com/yanzuoguang/util/helper/StringHelper.java
View file @ 170c48f0
......@@ -5,9 +5,11 @@ import com.yanzuoguang.util.base.ObjectHelper;
import com.yanzuoguang.util.exception.ExceptionHelper;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.DecimalFormat;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
......@@ -444,7 +446,16 @@ public class StringHelper {
}
}
private static boolean isBaseType(String clsName, Class<?> cls, Class<?> fromCls, Object fromValue) {
/**
* 是否属于基础类型
*
* @param clsName 基础类型名称
* @param cls 基础类型
* @param fromCls 来源类型
* @param fromValue 基础类型值
* @return 是否属于基础类型
*/
public static boolean isBaseType(String clsName, Class<?> cls, Class<?> fromCls, Object fromValue) {
if (clsName.equals(fromCls.getName())) {
return true;
}
......@@ -461,9 +472,34 @@ public class StringHelper {
* @return 转换成功的字符串
*/
public static String toString(Object obj) {
Class<?> fromCls = obj != null ? obj.getClass() : Object.class;
boolean isDouble = StringHelper.isBaseType(StringHelper.TYPE_DOUBLE, Double.class, fromCls, obj);
boolean isFromDouble = obj instanceof BigDecimal || isDouble;
if (isFromDouble) {
// 格式化设置(显示所有整数部分，小数点保留2位)
DecimalFormat decimalFormat = new DecimalFormat("#.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
String to = decimalFormat.format(obj);
String[] split = to.split("\\.");
StringBuilder sb = new StringBuilder(split[0]);
if (sb.length() == 0) {
sb.append("0");
}
if (split.length > 1) {
// 去掉右边的0
String right = StringHelper.trimRight(split[1], "0");
if (!right.isEmpty()) {
sb.append(".");
sb.append(right);
}
}
return sb.toString();
} else {
return obj == null ? null : obj.toString();
}
}
/**
* 将字符串转换为 bool ，当不能转换时，则默认为false
*
......
yzg-util-base/src/main/java/com/yanzuoguang/util/helper/YzgTimeout.java
View file @ 170c48f0
......@@ -2,7 +2,10 @@ package com.yanzuoguang.util.helper;
import com.yanzuoguang.util.log.Log;
import com.yanzuoguang.util.thread.ThreadHelper;
import com.yanzuoguang.util.vo.Ref;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Consumer;
/**
* 超时监控
......@@ -13,7 +16,8 @@ public class YzgTimeout {
public static final int TIME_OUT_DEFAULT = 15 * 1000;
public static final int TIME_OUT_TIP = 10 * 1000;
public static final int TIME_OUT_UNIT = 10;
private static Queue<TimeInfo> queueInfos = null;
/**
* 超时监控
......@@ -23,8 +27,22 @@ public class YzgTimeout {
* @param runnable 运行函数
*/
public static void timeOut(Class<?> cls, String message, Runnable runnable) {
timeHeart(TIME_OUT_DEFAULT, TIME_OUT_UNIT, TIME_OUT_TIP, runnable, (time) -> {
timeOut(cls, message, runnable, null);
}
/**
* 超时监控
*
* @param cls 日志类
* @param message 消息
* @param runnable 运行函数
*/
public static void timeOut(Class<?> cls, String message, Runnable runnable, Consumer<Long> consumer) {
timeHeart(TIME_OUT_DEFAULT, TIME_OUT_TIP, runnable, (time) -> {
Log.error(cls, "%s超时,已经执行%d豪秒,正在等待执行完成", message, time);
if (consumer != null) {
consumer.accept(time);
}
});
}
......@@ -35,7 +53,7 @@ public class YzgTimeout {
* @param heart 心跳函数
*/
public static void timeHeart(Runnable runnable, YzgTimeoutHeart heart) {
timeHeart(1000, 1000, 10, runnable, heart);
timeHeart(TIME_OUT_DEFAULT, TIME_OUT_TIP, runnable, heart);
}
/**
......@@ -43,36 +61,146 @@ public class YzgTimeout {
*
* @param tipOutDefault 默认超时时间
* @param timeOutTip 超时心跳间隔
* @param tipUnit 监听间隔时间(监听任务完成间隔时间)
* @param runnable 运行函数
* @param heart 心跳函数
*/
public static void timeHeart(int tipOutDefault, int timeOutTip, int tipUnit,
public static void timeHeart(int tipOutDefault, int timeOutTip,
Runnable runnable, YzgTimeoutHeart heart) {
final Ref<Boolean> isRun = new Ref<>(false);
ThreadHelper.runThread(() -> {
TimeInfo timeInfo = getTimeInfo(tipOutDefault, timeOutTip, heart);
try {
long timeMax = tipOutDefault;
long start = System.currentTimeMillis();
do {
long end = System.currentTimeMillis();
long time = end - start;
if (time > timeMax) {
timeMax += timeOutTip;
heart.heart(time);
runnable.run();
} finally {
timeInfo.setRun(true);
}
}
private static TimeInfo getTimeInfo(int tipOutDefault, int timeOutTip, YzgTimeoutHeart heart) {
init();
TimeInfo timeInfo = new TimeInfo(tipOutDefault, timeOutTip, heart);
synchronized (queueInfos) {
queueInfos.add(timeInfo);
}
return timeInfo;
}
ThreadHelper.sleep(tipUnit);
} while (!isRun.value);
private static void init() {
if (queueInfos != null) {
return;
}
synchronized (YzgTimeout.class) {
if (queueInfos != null) {
return;
}
queueInfos = new ConcurrentLinkedQueue<>();
ThreadHelper.runThread(() -> {
while (true) {
try {
runItem();
} catch (Exception ex) {
ex.printStackTrace();
}
ThreadHelper.sleep(200);
}
});
}
}
private static void runItem() {
int size;
synchronized (queueInfos) {
size = queueInfos.size();
}
for (int i = 0; i < size; i++) {
TimeInfo poll;
synchronized (queueInfos) {
poll = queueInfos.poll();
}
if (poll == null) {
return;
}
long end = System.currentTimeMillis();
long time = end - poll.getStart();
if (time > poll.getTimeMax()) {
try {
runnable.run();
} finally {
synchronized (isRun) {
isRun.value = true;
poll.setTimeMax(poll.getTimeMax() + poll.getTimeOutTip());
ThreadHelper.runThread(() -> poll.getHeart().heart(time));
} catch (Exception ex) {
ex.printStackTrace();
}
}
if (!poll.isRun()) {
synchronized (queueInfos) {
queueInfos.add(poll);
}
}
}
}
}
class TimeInfo {
private int timeOutDefault;
private int timeOutTip;
private YzgTimeoutHeart heart;
private boolean run;
private long start;
private int timeMax;
public TimeInfo(int timeOutDefault, int timeOutTip, YzgTimeoutHeart heart) {
this.timeOutDefault = timeOutDefault;
this.timeOutTip = timeOutTip;
this.heart = heart;
this.timeMax = timeOutDefault;
this.start = System.currentTimeMillis();
}
public int getTimeOutDefault() {
return timeOutDefault;
}
public void setTimeOutDefault(int timeOutDefault) {
this.timeOutDefault = timeOutDefault;
}
public int getTimeOutTip() {
return timeOutTip;
}
public void setTimeOutTip(int timeOutTip) {
this.timeOutTip = timeOutTip;
}
public YzgTimeoutHeart getHeart() {
return heart;
}
public void setHeart(YzgTimeoutHeart heart) {
this.heart = heart;
}
public boolean isRun() {
return run;
}
public void setRun(boolean run) {
this.run = run;
}
public long getStart() {
return start;
}
public void setStart(long start) {
this.start = start;
}
public int getTimeMax() {
return timeMax;
}
public void setTimeMax(int timeMax) {
this.timeMax = timeMax;
}
}
yzg-util-base/src/main/java/com/yanzuoguang/util/thread/ThreadHelper.java
View file @ 170c48f0
......@@ -4,8 +4,7 @@ import com.yanzuoguang.util.exception.ExceptionHelper;
import com.yanzuoguang.util.helper.DateHelper;
import java.util.Date;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.*;
import java.util.function.Predicate;
/**
......@@ -98,10 +97,7 @@ public class ThreadHelper {
* 监控线程的方法，防止线程执行死机
*/
private static void startMonitor() {
runThread(new Runnable() {
@Override
public void run() {
runThread(() -> {
do {
if (threadIsRun && ((System.currentTimeMillis() - threadDate.getTime()) / SECOND_UNIT) > NEXT_SECOND) {
try {
......@@ -116,7 +112,6 @@ public class ThreadHelper {
}
sleep(1000 * 60);
} while (true);
}
});
}
......@@ -210,12 +205,7 @@ public class ThreadHelper {
* @param run
*/
public static void runThread(final Runnable run) {
executeService.execute(new Runnable() {
@Override
public void run() {
executeCatch(run);
}
});
executeService.execute(() -> executeCatch(run));
}
/**
......@@ -224,9 +214,7 @@ public class ThreadHelper {
* @param run
*/
public static void runThread(final RunInterval run) {
runThread(new Runnable() {
@Override
public void run() {
runThread(() -> {
while (!run.isBreakFlag()) {
try {
run.getCode().run();
......@@ -235,7 +223,6 @@ public class ThreadHelper {
}
sleep(run.getTime());
}
}
});
}
......
yzg-util-base/src/main/java/com/yanzuoguang/util/vo/Ref.java
View file @ 170c48f0
......@@ -11,7 +11,7 @@ package com.yanzuoguang.util.vo;
* @author 颜佐光
*/
public class Ref<T> extends BaseVo {
public T value;
public volatile T value;
public Ref(T value) {
this.value = value;
......
yzg-util-base/src/main/java/com/yanzuoguang/util/vo/ResponseResult.java
View file @ 170c48f0
......@@ -44,7 +44,7 @@ public class ResponseResult<T> extends BaseVo {
* 是否是code错误
*/
@ApiModelProperty(value = "异常数据", notes = "当抛出异常时的数据，通常和code进行组合", required = true)
private boolean codeError = false;
private boolean codeError = true;
/**
* 构造函数
......
yzg-util-base/src/test/java/helper/TestTimeout.java 0 → 100644
View file @ 170c48f0
package helper;
import com.yanzuoguang.util.helper.YzgTimeout;
import com.yanzuoguang.util.thread.ThreadHelper;
import org.junit.Test;
public class TestTimeout {
public static final int WAIT_TIME = 1 * 60 * 1000;
@Test
public void test() {
YzgTimeout.timeOut(TestTimeout.class, "消息", () -> {
System.out.println("开始运行");
ThreadHelper.sleep(WAIT_TIME);
System.out.println("结束运行");
}, (time) -> {
// System.err.println("已经等待" + time);
});
}
@Test
public void testQueue() {
for (int i = 0; i < 5000; i++) {
ThreadHelper.runThread(() -> test());
}
ThreadHelper.sleep(WAIT_TIME * 2);
}
}
yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/AspectWeb.java
View file @ 170c48f0
......@@ -74,15 +74,19 @@ public class AspectWeb {
*/
@Around(value = "webAspect()")
public Object requestWebAround(ProceedingJoinPoint joinPoint) throws Throwable {
Class declaringType = joinPoint.getSignature().getDeclaringType();
String url = aspectLogUrl.getWebMethodUrl(joinPoint);
// 判断是否网关
boolean isGateWay = cloudConfig.isGateWay();
if (isGateWay) {
try {
// 网关不进行任何拦截处理
return executeMethod(joinPoint);
} catch (Exception ex) {
System.err.println("请求地址错误:" + url);
throw ex;
}
}
Class declaringType = joinPoint.getSignature().getDeclaringType();
String url = aspectLogUrl.getWebMethodUrl(joinPoint);
Object requestBody = aspectLogBody.getRequestBody(joinPoint);
boolean clear = aspectLogStart.requestLogInit();
LogVo log = new LogVo();
......
yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/WebConfig.java
View file @ 170c48f0
......@@ -32,7 +32,12 @@ public class WebConfig extends WebMvcConfigurerAdapter {
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
throws ServletException, IOException {
try {
filterChain.doFilter(request, response);
} catch (Exception ex) {
System.err.println("请求地址错误:" + request.getRequestURI());
throw ex;
}
}
};
}
......
yzg-util-db/src/main/java/com/yanzuoguang/db/impl/DbExecuteImpl.java
View file @ 170c48f0
......@@ -51,7 +51,7 @@ public class DbExecuteImpl implements DbExecute {
SqlInfo sqlInfo = new SqlInfo(targetClass, sqlName, sql, paras);
Ref<Integer> ret = new Ref<>(0);
executeSql(sqlInfo, (row, start) ->
ret.value = getJdbc().update(sqlInfo.getSql(), sqlInfo.getParas())
row.value = ret.value = getJdbc().update(sqlInfo.getSql(), sqlInfo.getParas())
);
return ret.value;
}
......@@ -158,9 +158,10 @@ public class DbExecuteImpl implements DbExecute {
boolean isError = false;
try {
YzgTimeout.timeOut(sqlInfo.getTargetClass(), sqlInfo.getSqlName(), () ->
sqlFunction.accept(row, start)
);
YzgTimeout.timeOut(sqlInfo.getTargetClass(), sqlInfo.getSqlName()
, () -> sqlFunction.accept(row, start)
// 打印超时的SQL语句
, (time) -> printSql.print(sqlInfo, time, row.value));
} catch (Exception ex) {
isError = true;
throw ex;
......
yzg-util-db/src/main/java/com/yanzuoguang/log/LogCountTime.java
View file @ 170c48f0
......@@ -86,7 +86,6 @@ public class LogCountTime {
*
* @param url 请求地址
*/
@Async
public void start(String url) {
LogUrlCountVo count = getCount(url);
count.addStart();
......@@ -99,7 +98,6 @@ public class LogCountTime {
* @param time 执行时间
* @param isError 是否错误
*/
@Async
public void finish(String url, long time, boolean isError) {
LogUrlCountVo count = getCount(url);
count.addFinish(time, isError);
......
yzg-util-file/src/main/java/com/yanzuoguang/cloud/file/YzgFileServiceImpl.java
View file @ 170c48f0
......@@ -101,7 +101,7 @@ public class YzgFileServiceImpl implements YzgFileService, ApplicationContextAwa
try {
uploadFile.transferTo(file);
} catch (Exception ex) {
throw YzgError.getRuntimeException(ex, "063", file.getName());
throw YzgError.getRuntimeException(ex, "063", file.getName(), serverFile);
}
// 视频上传结果
......
yzg-util-mq/src/main/java/com/yanzuoguang/mq/dao/impl/MessageDaoImpl.java
View file @ 170c48f0
......@@ -48,9 +48,8 @@ public class MessageDaoImpl extends BaseDaoImpl implements MessageDao, Initializ
.add("batchId", "AND a.batchId=?")
;
table.add(UPDATE_BATCH_SQL, "UPDATE Queue_Message AS a " +
"INNER JOIN ( SELECT * FROM Queue_Message WHERE (HandleTime IS NULL OR HandleTime < NOW()) " +
"ORDER BY HandleTime ASC,MessageId ASC {LIMIT} ) AS b ON a.MessageId = b.MessageId " +
table.add(UPDATE_BATCH_SQL, "UPDATE (SELECT * FROM Queue_Message WHERE (HandleTime IS NULL OR HandleTime < NOW()) ORDER BY HandleTime ASC,MessageId ASC {LIMIT} ) AS b " +
"INNER JOIN Queue_Message AS a ON a.MessageId = b.MessageId " +
"SET a.BatchId = ?,a.HandleTime=DATE_ADD(NOW(),INTERVAL 5 MINUTE) ", "batchId");
}
......
yzg-util-mq/src/main/java/com/yanzuoguang/mq/plan/YzgMqProcedure.java
View file @ 170c48f0
......@@ -16,9 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
* 消息队列处理
......@@ -40,13 +39,23 @@ public class YzgMqProcedure implements InitializingBean {
public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MILL_SECOND_125 = new TimeUnit("MillSecond:125", 125);
public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MILL_SECOND_250 = new TimeUnit("MillSecond:250", 250);
public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MILL_SECOND_500 = new TimeUnit("MillSecond:500", 500);
/**
* 64秒
*/
public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MIN = new TimeUnit("Second", 1000);
public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MAX = new TimeUnit("Hour", 1000 * 60 * 60);
/**
* 6 小时
*/
public static final TimeUnit YZG_MQ_SYSTEM_QUEUE_PLAN_MAX = new TimeUnit("Hour", 1000 * 60 * 60 * 6);
public static final List<TimeUnit> YZG_MQ_SYSTEM_QUEUE_PLAN_TIME = new ArrayList<>();
/**
* 执行的消息队列
*/
public static final String YZG_MQ_CLEAR_TOKEN_QUEUE = "YZG_MQ_CLEAR_TOKEN_QUEUE";
/**
* 私有队列,以及私有队列的时间
*/
private final Map<String, Set<Long>> privateQueue = new ConcurrentHashMap<>();
/**
* MQ服务
*/
......@@ -184,20 +193,39 @@ public class YzgMqProcedure implements InitializingBean {
if (req == null || req.getMessage() == null) {
return StringHelper.EMPTY;
}
MessageVo message = req.getMessage();
// 设置重新开始计算时间
if (newDedTime > 0) {
req.setStart(System.currentTimeMillis());
req.getMessage().setDedTime(newDedTime);
message.setDedTime(newDedTime);
}
// 新的时间
long waitTime = req.getWaitTime();
MessageVo message = req.getMessage();
if (waitTime > 0) {
TimeUnit timeUnit = getTimeUnit(waitTime);
int dedTimeType = message.getDedTimeType();
String key = StringHelper.getId(message.getExchangeName(), message.getRouteKey());
if (dedTimeType == MessageVo.DED_TIME_TYPE_PUBLIC) {
String json = JsonHelper.serialize(req);
String queueName = getQueueName(timeUnit);
long dedTime = Math.min(timeUnit.unit, waitTime);
message = new MessageVo(queueName, json, dedTime);
} else if (dedTimeType == MessageVo.DED_TIME_TYPE_PRIVATE) {
Set<Long> longs = privateQueue.computeIfAbsent(key, k -> new HashSet<>());
long dedTime = message.getDedTime();
String queueName = String.format("%s:%d", key, dedTime);
if (!longs.contains(dedTime)) {
synchronized (longs) {
queueService.create(new QueueVo(queueName, dedTime, message.getRouteKey()));
longs.add(dedTime);
}
}
message.setExchangeName(queueName);
message.setRouteKey(queueName);
message.setDedTime(0);
} else {
throw new RuntimeException("不支持的延迟处理类型");
}
} else {
message.setDedTime(0);
}
......
yzg-util-mq/src/main/java/com/yanzuoguang/mq/service/MqService.java
View file @ 170c48f0
......@@ -76,6 +76,17 @@ public interface MqService {
@ApiOperation(value = "消息收到确认")
void basicHandle(Message messageBody, Channel channel, String message, Consumer<String> consumerMessage);
/**
* 消息收到确认，出错时不需要重发
*
* @param messageBody 消息体
* @param channel 　收到的通道
* @param message 　消息内容
* @param dedTime 　消息延迟处理时间
* @param consumerMessage 消费者，具体业务处理函数
*/
@ApiOperation(value = "消息收到确认")
void basicHandle(Message messageBody, Channel channel, String message, long dedTime, Consumer<String> consumerMessage);
/**
* 消息收到确认,出错时重发
......
yzg-util-mq/src/main/java/com/yanzuoguang/mq/service/impl/MqServiceImpl.java
View file @ 170c48f0
......@@ -107,12 +107,19 @@ public class MqServiceImpl implements MqService {
@Override
public void basicHandle(Message messageBody, Channel channel, String message, Consumer<String> consumerMessage) {
this.basicHandle(messageBody, channel, StringHelper.EMPTY, StringHelper.EMPTY, message, 0, consumerMessage);
String consumerQueue = messageBody.getMessageProperties().getConsumerQueue();
this.basicHandle(messageBody, channel, consumerQueue, consumerQueue, message, 0, consumerMessage);
}
@Override
public void basicHandle(Message messageBody, Channel channel, String message, long dedTime, Consumer<String> consumerMessage) {
String consumerQueue = messageBody.getMessageProperties().getConsumerQueue();
this.basicHandle(messageBody, channel, consumerQueue, consumerQueue, message, dedTime, consumerMessage);
}
@Override
public void basicHandle(Message messageBody, Channel channel, String exchangeNameAndRouteKey, String message, Consumer<String> consumerMessage) {
this.basicHandle(messageBody, channel, exchangeNameAndRouteKey, exchangeNameAndRouteKey, message, 60 * 1000, consumerMessage);
this.basicHandle(messageBody, channel, exchangeNameAndRouteKey, exchangeNameAndRouteKey, message, 0, consumerMessage);
}
@Override
......@@ -131,7 +138,7 @@ public class MqServiceImpl implements MqService {
if (StringHelper.isEmpty(exchangeName, routeKey)) {
return;
}
this.message(new MessageVo(exchangeName, routeKey, message, dedTime));
this.message(new MessageVo(exchangeName, routeKey, message, dedTime, MessageVo.DED_TIME_TYPE_PRIVATE));
} finally {
this.basicAck(messageBody, channel);
}
......
yzg-util-mq/src/main/java/com/yanzuoguang/mq/vo/MessageVo.java
View file @ 170c48f0
......@@ -6,6 +6,7 @@ import com.yanzuoguang.util.helper.DateHelper;
import com.yanzuoguang.util.helper.StringHelper;
import com.yanzuoguang.util.vo.BaseVo;
import com.yanzuoguang.util.vo.InitDao;
import io.swagger.annotations.ApiModelProperty;
/**
* 发送消息
......@@ -15,6 +16,13 @@ import com.yanzuoguang.util.vo.InitDao;
@TableAnnotation("Queue_Message")
public class MessageVo extends BaseVo implements InitDao {
/**
* 延迟方式:0-自动,1-私有,2-公有
*/
@ApiModelProperty(notes = "延迟方式:0-公有,1-私有")
public static final int DED_TIME_TYPE_PUBLIC = 0;
public static final int DED_TIME_TYPE_PRIVATE = 1;
/**
* 消息编号，仅内部使用,消息编号会发送变动
*/
......@@ -40,6 +48,11 @@ public class MessageVo extends BaseVo implements InitDao {
*/
private long dedTime;
/**
* 延迟方式:0-自动,1-私有,2-公有
*/
@ApiModelProperty(notes = "延迟方式:0-自动,1-私有,2-公有")
private int dedTimeType;
/**
* 处理次数
*/
......@@ -112,6 +125,19 @@ public class MessageVo extends BaseVo implements InitDao {
this(exchangeNameRouteKey, exchangeNameRouteKey, message, dedTime);
}
/**
* 构造函数
*
* @param exchangeNameRouteKey 交换器名称+路由键
* @param message 消息内容
* @param dedTime 过期时间
* @param dedTimeType 过期处理方式
*/
public MessageVo(String exchangeNameRouteKey, String message, long dedTime, int dedTimeType) {
this(exchangeNameRouteKey, exchangeNameRouteKey, message, dedTime, dedTimeType);
}
/**
* 构造函数
*
......@@ -121,10 +147,24 @@ public class MessageVo extends BaseVo implements InitDao {
* @param dedTime 过期时间
*/
public MessageVo(String exchangeName, String routeKey, String message, long dedTime) {
this(exchangeName, routeKey, message, dedTime, DED_TIME_TYPE_PUBLIC);
}
/**
* 构造函数
*
* @param exchangeName 交换器名称
* @param routeKey 路由键
* @param message 消息内容
* @param dedTime 过期时间
* @param dedTimeType 过期处理方式
*/
public MessageVo(String exchangeName, String routeKey, String message, long dedTime, int dedTimeType) {
this.exchangeName = exchangeName;
this.routeKey = routeKey;
this.message = message;
this.dedTime = (int) dedTime;
this.dedTimeType = dedTimeType;
}
/**
......@@ -140,6 +180,7 @@ public class MessageVo extends BaseVo implements InitDao {
this.routeKey = routeKey;
this.message = message;
this.handleTime = handleTime;
this.dedTimeType = DED_TIME_TYPE_PUBLIC;
}
public String getMessageId() {
......@@ -182,6 +223,14 @@ public class MessageVo extends BaseVo implements InitDao {
this.dedTime = dedTime;
}
public int getDedTimeType() {
return dedTimeType;
}
public void setDedTimeType(int dedTimeType) {
this.dedTimeType = dedTimeType;
}
public int getHandleCount() {
return handleCount;
}
......
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