Skip to content

A
amos-boot-biz
Commit 5f1667e4 authored by tianyiming's avatar tianyiming
Browse files
Options

气瓶充装信息存入es优化

parent ac793df0
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 13 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/DateUtils.java
View file @ 5f1667e4
......@@ -6,12 +6,8 @@ import java.text.ParseException;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.TimeZone;
import java.util.*;
/**
* @description: 时间工具类
* @author: DELL
......@@ -219,6 +215,27 @@ public class DateUtils {
}
/**
* 字符串解析成时间对象
*
* @param dateTimeString String
* @param pattern StrUtils.DATE_TIME_PATTERN || StrUtils.DATE_PATTERN，如果为空，则为yyyy-MM-dd
* @return
* @throws ParseException
*/
public static Date dateParseWithPattern(String dateTimeString) throws ParseException {
List<String> dateFormats = Arrays.asList(DateUtils.DATE_TIME_PATTERN, DateUtils.DATE_PATTERN);
for(String format: dateFormats){
SimpleDateFormat sdf = new SimpleDateFormat(format);
try {
return sdf.parse(dateTimeString);
} catch (ParseException e) {
//intentionally empty
}
}
return null;
}
/**
* 将日期时间格式成只有日期的字符串（可以直接使用dateFormat，Pattern为Null进行格式化）
*
* @param dateTime Date
......
amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java
View file @ 5f1667e4
......@@ -152,8 +152,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
item.setCreditCode(collect.get(0).getCreditCode());
item.setRegionCode(collect.get(0).getRegionCode());
try {
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getInspectionDate()) ? 0L : DateUtils.dateParse(item.getInspectionDate(), DateUtils.DATE_TIME_PATTERN).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getInspectionDateAfter()) ? 0L : DateUtils.dateParse(item.getInspectionDateAfter(), DateUtils.DATE_TIME_PATTERN).getTime());
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime());
} catch (ParseException e) {
throw new RuntimeException(e);
}
......@@ -188,8 +188,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
item.setCreditCode(collect.get(0).getCreditCode());
item.setRegionCode(collect.get(0).getRegionCode());
try {
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getInspectionDate()) ? 0L : DateUtils.dateParse(item.getInspectionDate(), DateUtils.DATE_TIME_PATTERN).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getInspectionDateAfter()) ? 0L : DateUtils.dateParse(item.getInspectionDateAfter(), DateUtils.DATE_TIME_PATTERN).getTime());
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime());
} catch (ParseException e) {
throw new RuntimeException(e);
}
......@@ -223,7 +223,7 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
List<String> sequenceCodeS = cylinderFillingRecord.stream().map(ESCylinderFillingRecordDto::getSequenceCode).collect(Collectors.toList());
List<ESCylinderFillingRecordDto> cylinderFillingRecordInfo = cylinderFillingRecordMapper.getCylinderFillingRecordInfo(appIds, sequenceCodeS);
cylinderFillingRecord.stream().map(item -> {
List<ESCylinderFillingRecordDto> collect = cylinderFillingRecordInfo.stream().filter(e -> item.getAppIdAndSequenceCode().equals(e.getAppIdAndSequenceCode())).collect(Collectors.toList());
List<ESCylinderFillingRecordDto> collect = cylinderFillingRecordInfo.stream().filter(e -> e.getAppIdAndSequenceCode().equals(item.getAppIdAndSequenceCode())).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(collect)) {
item.setUnitName(collect.get(0).getUnitName());
item.setFactoryNum(collect.get(0).getFactoryNum());
......@@ -237,8 +237,8 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
item.setCreditCode(collect.get(0).getCreditCode());
item.setRegionCode(collect.get(0).getRegionCode());
try {
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getInspectionDate()) ? 0L : DateUtils.dateParse(item.getInspectionDate(), DateUtils.DATE_TIME_PATTERN).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getInspectionDateAfter()) ? 0L : DateUtils.dateParse(item.getInspectionDateAfter(), DateUtils.DATE_TIME_PATTERN).getTime());
item.setInspectionDateMs(ObjectUtils.isEmpty(item.getFillingStartTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingStartTime()).getTime());
item.setInspectionDateAfterMS(ObjectUtils.isEmpty(item.getFillingEndTime()) ? 0L : DateUtils.dateParseWithPattern(item.getFillingEndTime()).getTime());
} catch (ParseException e) {
throw new RuntimeException(e);
}
......
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