|
|
@@ -751,11 +751,85 @@ public class RyTask
|
|
|
TXinyiBigTableDay xinyiBigTableDay = this.xinyiBigTableDayMapper.selectAvgByDay(LocalDateTimeUtil.getCurrentDate().plusDays(-1).format(DateTimeFormatter.ofPattern(DateUtils.YYYYMMDD_TS)));
|
|
|
//保存到插入对象
|
|
|
//插入到数据库
|
|
|
- if(!Objects.isNull(xinyiBigTableDay))
|
|
|
+ if(!Objects.isNull(xinyiBigTableDay)){
|
|
|
+
|
|
|
+ ArrayList<BigDecimal> gyHycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> gyHycRjyZdAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> gyHycWnndAll = new ArrayList<>();
|
|
|
+
|
|
|
+ ArrayList<BigDecimal> rbHycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbHycWnndAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbYycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbQycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbWncjbAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbWntjzsAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbHfxwnndAll = new ArrayList<>();
|
|
|
+
|
|
|
+ ArrayList<BigDecimal> hyHycxsyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> hyQyanAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> hyQyckxsyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> hyHyzlsyAll = new ArrayList<>();
|
|
|
+
|
|
|
+ gyHycRjyAll.add(xinyiBigTableDay.getGyOneHymdDo());
|
|
|
+ gyHycRjyAll.add(xinyiBigTableDay.getGyTwoHymdDo());
|
|
|
+ gyHycRjyZdAll.add(xinyiBigTableDay.getGyOneHyzdDo());
|
|
|
+ gyHycRjyZdAll.add(xinyiBigTableDay.getGyTwoHyzdDo());
|
|
|
+ gyHycWnndAll.add(xinyiBigTableDay.getGyOneMlss());
|
|
|
+ gyHycWnndAll.add(xinyiBigTableDay.getGyTwoMlss());
|
|
|
+
|
|
|
+ rbHycRjyAll.add(xinyiBigTableDay.getGyOneHymdDo());
|
|
|
+ rbHycRjyAll.add(xinyiBigTableDay.getGyTwoHymdDo());
|
|
|
+ rbHycWnndAll.add(xinyiBigTableDay.getRbShcHyOneMlss());
|
|
|
+ rbHycWnndAll.add(xinyiBigTableDay.getRbShcHyTwoMlss());
|
|
|
+ rbYycRjyAll.add(xinyiBigTableDay.getRbShcYyOneDo());
|
|
|
+ rbYycRjyAll.add(xinyiBigTableDay.getRbShcYyTwoDo());
|
|
|
+ rbQycRjyAll.add(xinyiBigTableDay.getRbShcQyOneDo());
|
|
|
+ rbQycRjyAll.add(xinyiBigTableDay.getRbShcQyTwoDo());
|
|
|
+ rbWncjbAll.add(xinyiBigTableDay.getRbShcHyOneSv());
|
|
|
+ rbWncjbAll.add(xinyiBigTableDay.getRbShcHyTwoSv());
|
|
|
+ rbWntjzsAll.add(xinyiBigTableDay.getRbShcHyOneSvi());
|
|
|
+ rbWntjzsAll.add(xinyiBigTableDay.getRbShcHyTwoSvi());
|
|
|
+ rbHfxwnndAll.add(xinyiBigTableDay.getRbShcHyOneMlvss());
|
|
|
+ rbHfxwnndAll.add(xinyiBigTableDay.getRbShcHyTwoMlvss());
|
|
|
+
|
|
|
+ hyHycxsyAll.add(xinyiBigTableDay.getHyNo3Hlj1Jqr());
|
|
|
+ hyHycxsyAll.add(xinyiBigTableDay.getHyNo3Hlj2Jqr());
|
|
|
+ hyQyanAll.add(xinyiBigTableDay.getHyNh31Jqr());
|
|
|
+ hyQyanAll.add(xinyiBigTableDay.getHyNh32Jqr());
|
|
|
+ hyQyckxsyAll.add(xinyiBigTableDay.getHyNo3Qyc1Jqr());
|
|
|
+ hyQyckxsyAll.add(xinyiBigTableDay.getHyNo3Qyc2Jqr());
|
|
|
+ hyHyzlsyAll.add(xinyiBigTableDay.getHyTpHl1Jqr());
|
|
|
+ hyHyzlsyAll.add(xinyiBigTableDay.getHyTpHl2Jqr());
|
|
|
+
|
|
|
+ xinyiBigTableDay.setGyHycRjyAll(formatList(gyHycRjyAll));
|
|
|
+ xinyiBigTableDay.setGyHycRjyZdAll(formatList(gyHycRjyZdAll));
|
|
|
+ xinyiBigTableDay.setGyHycWnndAll(formatList(gyHycWnndAll));
|
|
|
+ xinyiBigTableDay.setRbHycRjyAll(formatList(rbHycRjyAll));
|
|
|
+ xinyiBigTableDay.setRbHycWnndAll(formatList(rbHycWnndAll));
|
|
|
+ xinyiBigTableDay.setRbYycRjyAll(formatList(rbYycRjyAll));
|
|
|
+ xinyiBigTableDay.setRbQycRjyAll(formatList(rbQycRjyAll));
|
|
|
+ xinyiBigTableDay.setRbWncjbAll(formatList(rbWncjbAll));
|
|
|
+ xinyiBigTableDay.setRbWntjzsAll(formatList(rbWntjzsAll));
|
|
|
+ xinyiBigTableDay.setRbHfxwnndAll(formatList(rbHfxwnndAll));
|
|
|
+ xinyiBigTableDay.setHyHycxsyAll(formatList(hyHycxsyAll));
|
|
|
+ xinyiBigTableDay.setHyQyanAll(formatList(hyQyanAll));
|
|
|
+ xinyiBigTableDay.setHyQyckxsyAll(formatList(hyQyckxsyAll));
|
|
|
+ xinyiBigTableDay.setHyHyzlsyAll(formatList(hyHyzlsyAll));
|
|
|
+
|
|
|
this.xinyiBigTableDayMapper.insertTXinyiBigTableDay(xinyiBigTableDay);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|
|
|
+ public String formatList(List<BigDecimal> list) {
|
|
|
+ if (CollectionUtils.isEmpty(list)) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+
|
|
|
+ boolean isNullList = list.stream().allMatch(x -> x == null);
|
|
|
+
|
|
|
+ return isNullList ? null : list.toString();
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
@@ -775,6 +849,70 @@ public class RyTask
|
|
|
if(!Objects.isNull(xinyiBigTableMonth)){
|
|
|
//先把日期处理一下 处理成只要月份的
|
|
|
xinyiBigTableMonth.setTestDate(xinyiBigTableMonth.getTestDate().substring(0, 7));
|
|
|
+
|
|
|
+ ArrayList<BigDecimal> gyHycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> gyHycRjyZdAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> gyHycWnndAll = new ArrayList<>();
|
|
|
+
|
|
|
+ ArrayList<BigDecimal> rbHycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbHycWnndAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbYycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbQycRjyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbWncjbAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbWntjzsAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> rbHfxwnndAll = new ArrayList<>();
|
|
|
+
|
|
|
+ ArrayList<BigDecimal> hyHycxsyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> hyQyanAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> hyQyckxsyAll = new ArrayList<>();
|
|
|
+ ArrayList<BigDecimal> hyHyzlsyAll = new ArrayList<>();
|
|
|
+
|
|
|
+ gyHycRjyAll.add(xinyiBigTableMonth.getGyOneHymdDo());
|
|
|
+ gyHycRjyAll.add(xinyiBigTableMonth.getGyTwoHymdDo());
|
|
|
+ gyHycRjyZdAll.add(xinyiBigTableMonth.getGyOneHyzdDo());
|
|
|
+ gyHycRjyZdAll.add(xinyiBigTableMonth.getGyTwoHyzdDo());
|
|
|
+ gyHycWnndAll.add(xinyiBigTableMonth.getGyOneMlss());
|
|
|
+ gyHycWnndAll.add(xinyiBigTableMonth.getGyTwoMlss());
|
|
|
+
|
|
|
+ rbHycRjyAll.add(xinyiBigTableMonth.getGyOneHymdDo());
|
|
|
+ rbHycRjyAll.add(xinyiBigTableMonth.getGyTwoHymdDo());
|
|
|
+ rbHycWnndAll.add(xinyiBigTableMonth.getRbShcHyOneMlss());
|
|
|
+ rbHycWnndAll.add(xinyiBigTableMonth.getRbShcHyTwoMlss());
|
|
|
+ rbYycRjyAll.add(xinyiBigTableMonth.getRbShcYyOneDo());
|
|
|
+ rbYycRjyAll.add(xinyiBigTableMonth.getRbShcYyTwoDo());
|
|
|
+ rbQycRjyAll.add(xinyiBigTableMonth.getRbShcQyOneDo());
|
|
|
+ rbQycRjyAll.add(xinyiBigTableMonth.getRbShcQyTwoDo());
|
|
|
+ rbWncjbAll.add(xinyiBigTableMonth.getRbShcHyOneSv());
|
|
|
+ rbWncjbAll.add(xinyiBigTableMonth.getRbShcHyTwoSv());
|
|
|
+ rbWntjzsAll.add(xinyiBigTableMonth.getRbShcHyOneSvi());
|
|
|
+ rbWntjzsAll.add(xinyiBigTableMonth.getRbShcHyTwoSvi());
|
|
|
+ rbHfxwnndAll.add(xinyiBigTableMonth.getRbShcHyOneMlvss());
|
|
|
+ rbHfxwnndAll.add(xinyiBigTableMonth.getRbShcHyTwoMlvss());
|
|
|
+
|
|
|
+ hyHycxsyAll.add(xinyiBigTableMonth.getHyNo3Hlj1Jqr());
|
|
|
+ hyHycxsyAll.add(xinyiBigTableMonth.getHyNo3Hlj2Jqr());
|
|
|
+ hyQyanAll.add(xinyiBigTableMonth.getHyNh31Jqr());
|
|
|
+ hyQyanAll.add(xinyiBigTableMonth.getHyNh32Jqr());
|
|
|
+ hyQyckxsyAll.add(xinyiBigTableMonth.getHyNo3Qyc1Jqr());
|
|
|
+ hyQyckxsyAll.add(xinyiBigTableMonth.getHyNo3Qyc2Jqr());
|
|
|
+ hyHyzlsyAll.add(xinyiBigTableMonth.getHyTpHl1Jqr());
|
|
|
+ hyHyzlsyAll.add(xinyiBigTableMonth.getHyTpHl2Jqr());
|
|
|
+
|
|
|
+ xinyiBigTableMonth.setGyHycRjyAll(formatList(gyHycRjyAll));
|
|
|
+ xinyiBigTableMonth.setGyHycRjyZdAll(formatList(gyHycRjyZdAll));
|
|
|
+ xinyiBigTableMonth.setGyHycWnndAll(formatList(gyHycWnndAll));
|
|
|
+ xinyiBigTableMonth.setRbHycRjyAll(formatList(rbHycRjyAll));
|
|
|
+ xinyiBigTableMonth.setRbHycWnndAll(formatList(rbHycWnndAll));
|
|
|
+ xinyiBigTableMonth.setRbYycRjyAll(formatList(rbYycRjyAll));
|
|
|
+ xinyiBigTableMonth.setRbQycRjyAll(formatList(rbQycRjyAll));
|
|
|
+ xinyiBigTableMonth.setRbWncjbAll(formatList(rbWncjbAll));
|
|
|
+ xinyiBigTableMonth.setRbWntjzsAll(formatList(rbWntjzsAll));
|
|
|
+ xinyiBigTableMonth.setRbHfxwnndAll(formatList(rbHfxwnndAll));
|
|
|
+ xinyiBigTableMonth.setHyHycxsyAll(formatList(hyHycxsyAll));
|
|
|
+ xinyiBigTableMonth.setHyQyanAll(formatList(hyQyanAll));
|
|
|
+ xinyiBigTableMonth.setHyQyckxsyAll(formatList(hyQyckxsyAll));
|
|
|
+ xinyiBigTableMonth.setHyHyzlsyAll(formatList(hyHyzlsyAll));
|
|
|
+
|
|
|
this.xinyiBigTableMonthMapper.insertTXinyiBigTableMonth(xinyiBigTableMonth);
|
|
|
}
|
|
|
}
|
