From 27080888a545111da63f0e8d1f5d5f21b199a063 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Mon, 1 Apr 2024 17:26:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?#=E5=8F=91=E7=94=B5=E9=87=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduled/service/operation/plate/DataService.java | 2 ++ .../service/operation/plate/impl/DataServiceImpl.java | 15 ++++++++++++++- .../java/com/hnac/hzims/message/fegin/MessageClient.java | 4 +--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java index 8f42cc0..743deea 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/DataService.java @@ -27,4 +27,6 @@ public interface DataService { List periodTargetSignages(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, List signages); Float periodTargetFloat(String startTime, String endTime, Integer accessRules, Integer cycleType, String deviceCode, Integer ride ,String signages); + + void multipleTargetData(String startTime, String endTime); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java index 02cb9a6..8ff8954 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/plate/impl/DataServiceImpl.java @@ -11,6 +11,8 @@ import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeCodeBySignagesVO; import com.hnac.hzinfo.datasearch.analyse.vo.AnalyzeDataConditionVO; import com.hnac.hzinfo.datasearch.real.po.RealDataSearchPO; import com.hnac.hzinfo.sdk.analyse.po.MultiAnalyzeCodePO; +import com.hnac.hzinfo.sdk.v5.device.DeviceDataClient; +import com.hnac.hzinfo.sdk.v5.device.dto.HisDataDeviceDTO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.tool.api.R; @@ -22,7 +24,10 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; @@ -34,6 +39,8 @@ import java.util.stream.Collectors; @Slf4j public class DataServiceImpl implements DataService { + private final DeviceDataClient deviceDataClient; + private final IAnalyseDataSearchClient analyseDataSearchClient; @Override @@ -196,4 +203,10 @@ public class DataServiceImpl implements DataService { } + @Override + public void multipleTargetData(String startTime, String endTime) { + HisDataDeviceDTO his = new HisDataDeviceDTO(); + deviceDataClient.getHisDataByMultipleDeviceCode(his); + } + } diff --git a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java index 17a5914..a28ef9e 100644 --- a/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java +++ b/hzims-service/message/src/main/java/com/hnac/hzims/message/fegin/MessageClient.java @@ -198,9 +198,7 @@ public class MessageClient extends BladeController implements IMessageClient{ record.setStatus(MessageConstants.NOT_PUSH); Map params = smsImmediatelyPushDTO.getParams(); int maxSize=35; - for (Map.Entry stringStringEntry : params.entrySet()) { - params.put(stringStringEntry.getKey(),getTruncateString(stringStringEntry.getValue(), maxSize)); - } + params.replaceAll((k, v) -> getTruncateString(v, maxSize)); record.setSmsParam(JSON.toJSONString(params)); Boolean flag = recordService.sendSmsImmediatelyMsg(record); if (!flag) { From 7f10d3b93387a18e2ad3c664a4fd1c8ed0e63dcb Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 2 Apr 2024 10:32:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?#=E9=9B=86=E4=B8=AD=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86=E6=9C=BA=E6=9E=84=E7=AD=9B?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java index 6e1cd30..75d101b 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmHandleServiceImpl.java @@ -155,7 +155,7 @@ public class AlarmHandleServiceImpl extends BaseServiceImpl handleUser() { - List users = userClient.userListByDeptAndChildrenWithAuth(Long.valueOf(AuthUtil.getUser().getDeptId())).getData(); + List users = userClient.userList(AuthUtil.getTenantId(), Long.valueOf(AuthUtil.getDeptId())).getData(); return users.stream().distinct().collect(Collectors.toList()); } From d2762da89182882294f545ff7e18a332ea14338e Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Tue, 2 Apr 2024 14:00:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?#=E9=82=AE=E4=BB=B6=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java index 4c4d8c7..fd14821 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/AreaMonthReportServiceImpl.java @@ -1258,7 +1258,7 @@ public class AreaMonthReportServiceImpl implements IAreaMonthReportService { map.put(mon, list); }); // 推送当月报表邮件 -// this.sendMonthReport(map, R.getData()); + this.sendMonthReport(map, R.getData()); redisTemplate.opsForValue().set(area_month_report_key, map); } /**