From e7ab4cee386885ec9ecdeafb716fe13ed986a465 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Thu, 16 Jan 2025 18:51:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E5=87=8F=E6=8E=92=E9=87=8F=202025?=
 =?UTF-8?q?=E5=B9=B41=E6=9C=8816=E6=97=A518:51:35?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/src/main/resources/application.yml            | 2 +-
 .../calculation/service/impl/CalcLogServiceImpl.java      | 8 ++++----
 .../manageboard/service/impl/PlantServiceImpl.java        | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml
index 46ae6e4..9f0089c 100644
--- a/application/src/main/resources/application.yml
+++ b/application/src/main/resources/application.yml
@@ -62,7 +62,7 @@ database:
 # 数据源及mybatis、mybatis-flex配置
 mybatis-flex:
   #是否开启审计日志打印
-  auditEnable: true
+  auditEnable: false
   #mapper 包扫描路径
   typeAliasesPackage: com.thing.**.mapper
   #mapper 扫描路径
diff --git a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
index e64bbbd..13d24f3 100644
--- a/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
+++ b/modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
@@ -47,7 +47,7 @@ public class CalcLogServiceImpl extends BaseServiceImpl<CalcLogMapper, CalcLogEn
     private static final Long TIMEOUT_INTERVAL = 1000 * 60 * 60 * 24 * 7L;
 
     /** 计算失败后，计算异常状态下的最大计算次数 */
-    private static final Integer MAX_CALC_COUNT = 5;
+    private static final Integer MAX_CALC_COUNT = 50;
 
     @Override
     public QueryWrapper getWrapper(Map<String, Object> params) {
@@ -138,10 +138,10 @@ public class CalcLogServiceImpl extends BaseServiceImpl<CalcLogMapper, CalcLogEn
                         .ge(CalcLogEntity::getTime, startTs, Objects.nonNull(startTs))
                         .le(CalcLogEntity::getTime, endTs, Objects.nonNull(endTs))
                         .eq(CalcLogEntity::getStatus, CalcStatus.UN_CALCULATED.getCode())
-                        .or(
-                                CALC_LOG_ENTITY
+                        .ne(CalcLogEntity::getStatus, 0)
+                        .or(CALC_LOG_ENTITY
                                         .STATUS
-                                        .eq(CalcStatus.CALCULATE_EXCEPTION.getCode())
+                                        .ne(CalcStatus.CALCULATE_EXCEPTION.getCode())
                                         .and(CALC_LOG_ENTITY.CALC_COUNT.le(MAX_CALC_COUNT))));
     }
 
diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java
index 4746921..2514cc9 100644
--- a/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java
+++ b/modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java
@@ -7,7 +7,6 @@ import com.mybatisflex.core.query.QueryColumn;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.thing.common.core.exception.SysException;
 import com.thing.common.core.utils.ConvertUtils;
-import com.thing.common.core.web.response.Result;
 import com.thing.common.data.tskv.TsKvDTO;
 import com.thing.common.orm.service.impl.BaseServiceImpl;
 import com.thing.common.tskv.service.TsKvService;