修改查询时间段

log-manager/src/main/java/com/mortals/xhx/module/access/dao/ibatis/AccessLogDaoImpl.java

@@ -35,7 +35,12 @@ public class AccessLogDaoImpl extends SubmeterDaoImpl<AccessLogEntity,Long> impl
         TableParam tableParam = new TableParam();
         if (!ObjectUtils.isEmpty(makeTableNameOfentity.getCreateTime())) {
             tableParam.unionTime = makeTableNameOfentity.getCreateTime();
-        } else if (makeTableNameOfentity instanceof AccessLogQuery) {
+        }else  if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeStart())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeStart());
+        } else if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeEnd())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeEnd());
+        }
+         if (makeTableNameOfentity instanceof AccessLogQuery) {
             AccessLogQuery AccessLogQuery = (AccessLogQuery) makeTableNameOfentity;
             if (StringUtils.isNotEmpty(AccessLogQuery.getCreateTimeStart())) {
                 tableParam.unionTime = DateUtils.StrToDate(AccessLogQuery.getCreateTimeStart());

log-manager/src/main/java/com/mortals/xhx/module/biz/dao/ibatis/BizLogDaoImpl.java

@@ -35,7 +35,13 @@ public class BizLogDaoImpl extends SubmeterDaoImpl<BizLogEntity,Long> implements
         TableParam tableParam = new TableParam();
         if (!ObjectUtils.isEmpty(makeTableNameOfentity.getCreateTime())) {
             tableParam.unionTime = makeTableNameOfentity.getCreateTime();
-        } else if (makeTableNameOfentity instanceof BizLogQuery) {
+        } else  if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeStart())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeStart());
+        } else if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeEnd())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeEnd());
+        }
+
+         if (makeTableNameOfentity instanceof BizLogQuery) {
             BizLogQuery BizLogQuery = (BizLogQuery) makeTableNameOfentity;
             if (StringUtils.isNotEmpty(BizLogQuery.getCreateTimeStart())) {
                 tableParam.unionTime = DateUtils.StrToDate(BizLogQuery.getCreateTimeStart());

log-manager/src/main/java/com/mortals/xhx/module/error/dao/ibatis/ErrorLogDaoImpl.java

@@ -34,7 +34,13 @@ public class ErrorLogDaoImpl extends SubmeterDaoImpl<ErrorLogEntity,Long> implem
         TableParam tableParam = new TableParam();
         if (!ObjectUtils.isEmpty(makeTableNameOfentity.getCreateTime())) {
             tableParam.unionTime = makeTableNameOfentity.getCreateTime();
-        } else if (makeTableNameOfentity instanceof ErrorLogQuery) {
+        }else  if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeStart())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeStart());
+        } else if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeEnd())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeEnd());
+        }
+
+        if (makeTableNameOfentity instanceof ErrorLogQuery) {
             ErrorLogQuery ErrorLogQuery = (ErrorLogQuery) makeTableNameOfentity;
             if (StringUtils.isNotEmpty(ErrorLogQuery.getCreateTimeStart())) {
                 tableParam.unionTime = DateUtils.StrToDate(ErrorLogQuery.getCreateTimeStart());

log-manager/src/main/java/com/mortals/xhx/module/operate/dao/ibatis/OperateLogDaoImpl.java

@@ -39,7 +39,14 @@ public class OperateLogDaoImpl extends SubmeterDaoImpl<OperateLogEntity, Long> i
         TableParam tableParam = new TableParam();
         if (!ObjectUtils.isEmpty(makeTableNameOfentity.getCreateTime())) {
             tableParam.unionTime = makeTableNameOfentity.getCreateTime();
-        } else if (makeTableNameOfentity instanceof OperateLogQuery) {
+        } else if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeStart())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeStart());
+        } else if (StringUtils.isNotEmpty(makeTableNameOfentity.getCreateTimeEnd())) {
+            tableParam.unionTime = DateUtils.StrToDate(makeTableNameOfentity.getCreateTimeEnd());
+        }
+
+
+        if (makeTableNameOfentity instanceof OperateLogQuery) {
             OperateLogQuery OperateLogQuery = (OperateLogQuery) makeTableNameOfentity;
             if (StringUtils.isNotEmpty(OperateLogQuery.getCreateTimeStart())) {
                 tableParam.unionTime = DateUtils.StrToDate(OperateLogQuery.getCreateTimeStart());

log-manager/src/test/java/com/mortals/httpclient/error/ErrorLogController.http

@@ -29,16 +29,15 @@ Content-Type: application/json
 
 ###异常日志更新与保存
 POST {{baseUrl}}/error/log/save
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "traceID":"mbto1z",
-        "appName":"6lcsoy",
-        "hostName":"ul06eq",
-        "message":"8kau4i",
+        "traceID":"64364f4f9b8d47e61cb6b24c",
+        "appName":"portal-manager",
+        "hostName":"",
+        "message":"更新失败！",
         "platform":"java",
-        "culprit":"8r6wce",
+        "culprit":"com.mortals.xhx.module.page.dao.ibatis.PageAccessDaoImpl.insert",
         "tags":"sw7jp2",
         "level":"INFO",
         "environment":"ayr3ua",
@@ -49,7 +48,7 @@ Content-Type: application/json
         "errorStack":"z3yxnh",
         "context":"az7aus",
         "extra":"9c0pnj",
-        "logTime":"1661270400000"
+        "logTime":"1688695785180"
 }