Browse Source

年减排量

2025年1月16日18:51:35
qingyuan_dev_new
lishuai 1 year ago
parent
commit
e7ab4cee38
  1. 2
      application/src/main/resources/application.yml
  2. 8
      modules/calculation/src/main/java/com/thing/calculation/service/impl/CalcLogServiceImpl.java
  3. 1
      modules/qingyuan/src/main/java/com/thing/qingyuan/manageboard/service/impl/PlantServiceImpl.java

2
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 扫描路径

8
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))));
}

1
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;

Loading…
Cancel
Save