From b7f46c7479073844af2d55e5e2dd180748d97470 Mon Sep 17 00:00:00 2001 From: siyang <2337720667@qq.com> Date: Fri, 16 Aug 2024 13:48:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?filter=5Flog=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/thing/filter/rule/controller/FilterLogController.java | 1 + .../thing/filter/rule/service/impl/FilterLogServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java index cd1f961..1fe61f5 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/controller/FilterLogController.java @@ -42,6 +42,7 @@ public class FilterLogController { @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)"), @Parameter(name = "filterRuleName", description = "过滤规则名称"), @Parameter(name = "status", description = "状态：1-未匹配，2-已匹配，3-计算成功，4-计算异常，5-已通知"), + @Parameter(name = "result", description = "过滤结果：true | false"), }) public Result> page(@Parameter(hidden = true) @RequestParam Map params){ PageData page = filterLogService.handlePage(params); diff --git a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java index 7ec16b2..b0bed35 100644 --- a/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java +++ b/modules/filter-rule/src/main/java/com/thing/filter/rule/service/impl/FilterLogServiceImpl.java @@ -38,6 +38,7 @@ public class FilterLogServiceImpl extends BaseServiceImpl params) { String filterRuleName = MapUtils.getString(params, "filterRuleName"); Integer status = MapUtils.getInteger(params, "status"); + Boolean result = MapUtils.getBoolean(params, "result"); return QueryWrapper.create() .select( FILTER_RULE_ENTITY.NAME.as("filter_rule_name"), @@ -48,6 +49,7 @@ public class FilterLogServiceImpl extends BaseServiceImpl Date: Fri, 16 Aug 2024 15:32:04 +0800 Subject: [PATCH 2/4] =?UTF-8?q?CQC=20=E6=8A=A5=E8=A1=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=88=B0cqc=E5=B9=B3=E5=8F=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83=EF=BC=8Cbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../carbon/pub/service/impl/PubCockpitServiceImpl.java | 2 +- .../cqc/cqcCarbonReport/dto/CqcCarbonReportCountInfo.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java index e02839a..012ac55 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java @@ -63,7 +63,7 @@ public class PubCockpitServiceImpl implements PubCockpitService { Long processCount = carbonPubProductionModelMapper.selectCountByQuery(QueryWrapper.create()); dto.setProcessCount(processCount); - + //服务产品数 Long productsCount = carbonPubProductionReportMapper.selectCountByQuery(QueryWrapper.create().select()); dto.setProductsCount(productsCount); diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportCountInfo.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportCountInfo.java index ec3c756..248400c 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportCountInfo.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/dto/CqcCarbonReportCountInfo.java @@ -9,11 +9,11 @@ public class CqcCarbonReportCountInfo { @Schema(description = "待提交") - private Long pendingSubmitted; + private Long pendingSubmitted = 0L; @Schema(description = "待发证") - private Long pendingCertification; + private Long pendingCertification = 0L; @Schema(description = "已发证") - private Long issued; + private Long issued = 0L; From 572d8812bb13222c658060d829f7df4d003b4fe0 Mon Sep 17 00:00:00 2001 From: lishuai Date: Fri, 16 Aug 2024 16:41:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=E8=B0=83=E6=95=B4=202024=E5=B9=B48?= =?UTF-8?q?=E6=9C=8816=E6=97=A516:41:13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AlarmDisposeLogController.java | 2 -- .../impl/AlarmDisposeLogServiceImpl.java | 16 +++++++--- .../controller/AnalysisDataController.java | 32 ++++--------------- .../service/impl/AnalysisDataServiceImpl.java | 2 +- .../impl/IotThingSourceServiceImpl.java | 3 +- .../service/impl/IotThingApiServiceImpl.java | 4 +-- .../detail/dto/IotThingRelationDetailDTO.java | 2 ++ .../IotThingRelationDetailServiceImpl.java | 12 +++++++ .../mapper/device/IotThingSourceMapper.xml | 5 +-- 9 files changed, 41 insertions(+), 37 deletions(-) diff --git a/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmDisposeLogController.java b/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmDisposeLogController.java index d892756..bf9996e 100644 --- a/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmDisposeLogController.java +++ b/modules/alarm/src/main/java/com/thing/alarm/alarm/controller/AlarmDisposeLogController.java @@ -77,9 +77,7 @@ public class AlarmDisposeLogController { public Result save(@RequestBody AlarmDisposeLogDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - alarmDisposeLogService.addAlarmDisposeLog(dto); - return new Result(); } diff --git a/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmDisposeLogServiceImpl.java b/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmDisposeLogServiceImpl.java index 187e4aa..2ede0e6 100644 --- a/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmDisposeLogServiceImpl.java +++ b/modules/alarm/src/main/java/com/thing/alarm/alarm/service/impl/AlarmDisposeLogServiceImpl.java @@ -63,8 +63,10 @@ public class AlarmDisposeLogServiceImpl extends BaseServiceImpl> list = MapUtil.get(analysisDataRespMap, "result", List.class); + List list = MapUtil.get(analysisDataRespMap, "result", List.class); if (CollectionUtil.isNotEmpty(list)){ DecimalFormat decimalFormat = new DecimalFormat("#.##"); // 计算最大值 OptionalDouble maxVal = list.stream() - .filter(m -> m.get("val") != null) // 过滤掉 "val" 为空的元素 - .mapToDouble(m -> { - if(m.get("val") instanceof Number){ - return ((Number)m.get("val")).doubleValue(); - }else{ - return Double.parseDouble(m.get("val").toString()); - } - }).max(); + .filter(m -> m.getVal() != null) // 过滤掉 "val" 为空的元素 + .mapToDouble(m -> Double.parseDouble(m.getVal())).max(); String formattedMax = decimalFormat.format(maxVal.getAsDouble()); analysisDataRespMap.put("max",formattedMax); // 计算最小值 OptionalDouble minVal = list.stream() - .filter(m -> m.get("val") != null) // 过滤掉 "val" 为空的元素 - .mapToDouble(m -> { - if(m.get("val") instanceof Number){ - return ((Number)m.get("val")).doubleValue(); - }else{ - return Double.parseDouble(m.get("val").toString()); - } - }).min(); + .filter(m -> m.getVal() != null) // 过滤掉 "val" 为空的元素 + .mapToDouble(m -> Double.parseDouble(m.getVal())).min(); String formattedMin = decimalFormat.format(minVal.getAsDouble()); analysisDataRespMap.put("min",formattedMin); // 计算平均值 Double averageVal = list.stream() - .filter(m -> m.get("val") != null) // 过滤掉 "val" 为空的元素 - .mapToDouble(m -> { - if(m.get("val") instanceof Number){ - return ((Number)m.get("val")).doubleValue(); - }else{ - return Double.parseDouble(m.get("val").toString()); - } - }).average().orElse(0D); + .filter(m -> m.getVal() != null) // 过滤掉 "val" 为空的元素 + .mapToDouble(m -> Double.parseDouble(m.getVal())).average().orElse(0D); String formattedAverage = decimalFormat.format(averageVal); analysisDataRespMap.put("average",formattedAverage); diff --git a/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java b/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java index faf6003..4d0d2d8 100644 --- a/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/device/analysisdata/service/impl/AnalysisDataServiceImpl.java @@ -831,7 +831,7 @@ public class AnalysisDataServiceImpl implements AnalysisDataService { * @return list */ private List getCacheTsKvDTO(AnalysisDataReqDTO analysisDataReqDTO, List iotThingSourceList, List childList) { - List thingAttrList = iotThingSourceList.parallelStream() + List thingAttrList = iotThingSourceList.stream() .filter(item -> childList.stream().noneMatch(child -> Objects.equals(child.getPid(), item.getId()))) .map(item -> new ThingAttrDTO(item.getThingTenantId(), item.getThingCode(), Lists.newArrayList(item.getThingAttrCode()))) .collect(Collectors.toList()); diff --git a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java index 6cd03e2..da4b48e 100644 --- a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java @@ -480,7 +480,8 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl iotThingSourceAttrList = ConvertUtils.sourceToTarget(iotThingSourceList, IotThingSourceAttrRespDTO.class); - return iotThingSourceAttrList.stream().filter(distinctByKey(IotThingSourceAttrRespDTO::getThingAttrCode)).sorted(Comparator.comparing(IotThingSourceAttrRespDTO::getSort)).collect(Collectors.toList()); + return iotThingSourceAttrList.stream().filter(distinctByKey(IotThingSourceAttrRespDTO::getThingAttrCode)).sorted(Comparator.comparing(IotThingSourceAttrRespDTO::getSort, + Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList()); } @Override diff --git a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java index 858b6b3..854cf23 100644 --- a/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/thing/api/service/impl/IotThingApiServiceImpl.java @@ -838,9 +838,9 @@ public class IotThingApiServiceImpl extends BaseServiceImpl relationDetaillist = cache.getTopicMap(CacheNameEnum.THING_DETAIL_RELATION); if (CollectionUtils.isEmpty(relationDetaillist)) { List list = mapper.selectListByQueryAs(getWrapper(orderField, order, null, null), IotThingRelationDetailDTO.class); + if(CollectionUtils.isNotEmpty(list)){ + list.forEach(s->{ + String toCode = s.getToCode(); + thingModelService.findByCode(toCode).ifPresent(thingModelEntity -> { + s.setThingStatus(thingModelEntity.getStatus()); + }); + }); + } relationDetaillist = JsonConverter.convertToJsonObjectListObjectNode(list); if (CollectionUtils.isEmpty(relationDetaillist)) { return new ArrayList<>(); diff --git a/modules/thing/src/main/resources/mapper/device/IotThingSourceMapper.xml b/modules/thing/src/main/resources/mapper/device/IotThingSourceMapper.xml index f23b943..c70c9f1 100644 --- a/modules/thing/src/main/resources/mapper/device/IotThingSourceMapper.xml +++ b/modules/thing/src/main/resources/mapper/device/IotThingSourceMapper.xml @@ -38,7 +38,7 @@ its.thing_attr_code, its.thing_attr_name, its.thing_attr_code_type, - its.data_rule, + its.data_deal_config as data_rule, its.thing_serial, its.thing_icon, its.thing_attr_unit, @@ -51,7 +51,8 @@ iot_thing_source its INNER JOIN iot_thing_entity itt ON its.thing_id = itt.id - its.pid is null +-- its.pid is null + 1=1 and its.thing_id in From 1c5e4eea6a34e0ebeef09fad29efad39d4c05068 Mon Sep 17 00:00:00 2001 From: xiachao Date: Fri, 16 Aug 2024 16:59:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=BE=A7=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/CarbonPubMaterialFactorMapper.java | 6 +++++- .../CarbonPubProductionReportMapper.java | 2 ++ .../service/impl/PubCockpitServiceImpl.java | 21 ++++++++++++------- .../CarbonPubProductionReportMapper.xml | 9 ++++++++ .../impl/CqcCarbonReportServiceImpl.java | 8 +++---- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java index a63cb48..9efdd6c 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubMaterialFactorMapper.java @@ -3,6 +3,7 @@ package com.thing.carbon.pub.mapper; import com.thing.carbon.pub.entity.CarbonPubMaterialFactorEntity; import com.thing.common.orm.mapper.PowerBaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** * 碳排因子库 @@ -12,5 +13,8 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface CarbonPubMaterialFactorMapper extends PowerBaseMapper { - + + + @Select("SELECT sum(hot_score) FROM carbon_pub_material_factor") + Long selectCarbonLibCount(); } \ No newline at end of file diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java index 8fc1160..3c3dc0b 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/mapper/CarbonPubProductionReportMapper.java @@ -18,4 +18,6 @@ import java.util.List; public interface CarbonPubProductionReportMapper extends PowerBaseMapper { List getAllModels(@Param("tenantCode") Long tenantCode); + + Long selectProductsCount(); } \ No newline at end of file diff --git a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java index 012ac55..e808022 100644 --- a/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java +++ b/modules/carbon-public/src/main/java/com/thing/carbon/pub/service/impl/PubCockpitServiceImpl.java @@ -3,10 +3,7 @@ package com.thing.carbon.pub.service.impl; import com.mybatisflex.core.query.QueryWrapper; import com.thing.carbon.pub.dto.CockpitEnterpriseInfo; import com.thing.carbon.pub.dto.CockpitStatisticsDto; -import com.thing.carbon.pub.mapper.CarbonPubProductionModelMapper; -import com.thing.carbon.pub.mapper.CarbonPubProductionReportMapper; -import com.thing.carbon.pub.mapper.CarbonPubSupplierMapper; -import com.thing.carbon.pub.mapper.PubCockpitMapper; +import com.thing.carbon.pub.mapper.*; import com.thing.carbon.pub.service.PubCockpitService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +30,12 @@ public class PubCockpitServiceImpl implements PubCockpitService { @Autowired private CarbonPubProductionReportMapper carbonPubProductionReportMapper; + @Autowired + private CarbonPubMaterialFactorMapper carbonPubMaterialFactorMapper; + + @Autowired + private CarbonPubProductionResultMapper carbonPubProductionResultMapper; + @Override public List cockpitEnterpriseInfoList() { @@ -64,17 +67,19 @@ public class PubCockpitServiceImpl implements PubCockpitService { Long processCount = carbonPubProductionModelMapper.selectCountByQuery(QueryWrapper.create()); dto.setProcessCount(processCount); //服务产品数 - Long productsCount = carbonPubProductionReportMapper.selectCountByQuery(QueryWrapper.create().select()); + Long productsCount = carbonPubProductionReportMapper.selectProductsCount(); dto.setProductsCount(productsCount); Long carbonReportCount = carbonPubProductionReportMapper.selectCountByQuery(QueryWrapper.create()); dto.setCarbonReportCount(carbonReportCount); + Long carbonLibCount = carbonPubMaterialFactorMapper.selectCarbonLibCount(); + dto.setCarbonLibCount(carbonLibCount); + Long carbonCount = carbonPubProductionResultMapper.selectCountByQuery(QueryWrapper.create()); + dto.setCarbonCount(carbonCount); - - - return null; + return dto; } } diff --git a/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml b/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml index 3ed8ebb..ef69ab9 100644 --- a/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml +++ b/modules/carbon-public/src/main/resources/mapper/CarbonPubProductionReportMapper.xml @@ -15,4 +15,13 @@ + + + + + \ No newline at end of file diff --git a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java index 3bef537..f11beab 100644 --- a/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java +++ b/modules/cqc-service/src/main/java/com/thing/cqc/cqcCarbonReport/service/impl/CqcCarbonReportServiceImpl.java @@ -106,10 +106,10 @@ public class CqcCarbonReportServiceImpl extends BaseServiceImpl