diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/AggCarbon.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/AggCarbon.java index ec34fc1..659ea5e 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/AggCarbon.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/AggCarbon.java @@ -65,7 +65,7 @@ public class AggCarbon { } public BigDecimal getUsageAvg() { - return usageAvg == null ? null : usageAvg.setScale(2, RoundingMode.HALF_UP); + return usageAvg == null ? null : usageAvg.setScale(3, RoundingMode.HALF_UP); } public BigDecimal getCarbonAvg() { @@ -210,7 +210,7 @@ public class AggCarbon { if (Objects.isNull(value)) { return null; } - return value.divide(count, 2, RoundingMode.HALF_UP); + return value.divide(count, 3, RoundingMode.HALF_UP); } private AggCarbon add(AggCarbon other){ diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java index f896672..baba6e0 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/dto/MptDetail.java @@ -65,8 +65,8 @@ public class MptDetail { public MptDetail add(MptDetail other) { if (Objects.equals(getMaterialCode(), other.getMaterialCode())) { setDosage(AggUtil.sum(totalDosage(), other.totalDosage())); - setAcquireCarbon(AggUtil.sum(getAcquireCarbon(), other.getAcquireCarbon())); - setTransportUse(AggUtil.sum(getTransportUse(), other.getTransportUse())); + setAcquireCarbon(other.getAcquireCarbon().multiply(getDosage())); + setTransportUse(other.getTransportUse().multiply(getDosage())); } return this; } diff --git a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java index 4437979..62467f4 100644 --- a/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java +++ b/modules/carbon-track/src/main/java/com/thing/carbontrack/productionResult/service/impl/IotCarbonProductionResultServiceImpl.java @@ -203,6 +203,7 @@ public class IotCarbonProductionResultServiceImpl } List details = JSONArray.parseArray(detailJson, MptDetail.class); details.forEach(e -> e.setNum(item.getFinalNum())); + detailList.addAll(details); } diff --git a/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java b/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java index 5b1976c..cc2946c 100644 --- a/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/sys/tenant/service/impl/SysTenantDetailServiceImpl.java @@ -694,6 +694,7 @@ public class SysTenantDetailServiceImpl extends BaseServiceImpl - select t3.*, (select lang.field_value from sys_language lang where lang.table_name='sys_menu' and lang.field_name='name' + select distinct t3.*, (select lang.field_value from sys_language lang where lang.table_name='sys_menu' and lang.field_name='name' and lang.table_id=t3.id and lang.language=#{language}) as name from sys_role_user t1 inner join sys_role_menu t2 on t1.role_id = t2.role_id inner join sys_menu t3 on t2.menu_id = t3.id