diff --git a/src/main/java/com/ykMap/service/impl/LineServiceImpl.java b/src/main/java/com/ykMap/service/impl/LineServiceImpl.java index 655149c..9d64cfb 100644 --- a/src/main/java/com/ykMap/service/impl/LineServiceImpl.java +++ b/src/main/java/com/ykMap/service/impl/LineServiceImpl.java @@ -1,7 +1,6 @@ package com.ykMap.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import com.ykMap.entity.response.EquipResponse; import com.ykMap.entity.response.GetCarIdInfoResponse; import com.ykMap.entity.response.ItemsResponse; @@ -70,17 +69,17 @@ public class LineServiceImpl implements LineService { @Override public List lineTemplate(String area) { List list; - LocalDate now = LocalDate.now(); - if (now.getDayOfMonth() < 26) { - LocalDate a1 = now.minusMonths(2).withDayOfMonth(26); - LocalDate a2 = now.minusMonths(1).withDayOfMonth(25); - list = lineMapper.lineTemplate(area, a1, a2); - } else { - LocalDate a1 = now.minusMonths(1).withDayOfMonth(26); - LocalDate a2 = now.withDayOfMonth(25); - list = lineMapper.lineTemplate(area, a1, a2); - } - if (CollectionUtil.isEmpty(list)) { +// LocalDate now = LocalDate.now(); +// if (now.getDayOfMonth() < 26) { +// LocalDate a1 = now.minusMonths(2).withDayOfMonth(26); +// LocalDate a2 = now.minusMonths(1).withDayOfMonth(25); +// list = lineMapper.lineTemplate(area, a1, a2); +// } else { +// LocalDate a1 = now.minusMonths(1).withDayOfMonth(26); +// LocalDate a2 = now.withDayOfMonth(25); +// list = lineMapper.lineTemplate(area, a1, a2); +// } +// if (CollectionUtil.isEmpty(list)) { // 查询数据库最新时间 LocalDateTime dataTime = lineMapper.findLineTemplateTime(); if (dataTime == null) { @@ -91,7 +90,7 @@ public class LineServiceImpl implements LineService { // 获取数据库最新时间月份的最后一天 LocalDate lastDayOfMonth = dataTime.with(TemporalAdjusters.lastDayOfMonth()).toLocalDate(); list = lineMapper.lineTemplate(area, firstDayOfMonth, lastDayOfMonth); - } +// } return list; } diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 4996af6..8d16124 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -61,4 +61,10 @@ spring: merge-sql: true wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true + +# 日志配置 +logging: + level: + com.ykMap: error + org.springframework: error \ No newline at end of file diff --git a/src/main/resources/com/ykMap/mapper/LineMapper.xml b/src/main/resources/com/ykMap/mapper/LineMapper.xml index d165a84..e0354fa 100644 --- a/src/main/resources/com/ykMap/mapper/LineMapper.xml +++ b/src/main/resources/com/ykMap/mapper/LineMapper.xml @@ -36,20 +36,16 @@ and is_delete =0 and state = '正常'