From c98f5eee8777711610dfeaf85ad4b7a92d476e6a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 07 五月 2025 18:53:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 4ed6fa7..4f92786 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -658,6 +658,7 @@
MinitorDataSearchRequest param = new MinitorDataSearchRequest();
param.setResourceTypeCodes(new String[]{});
param.setRegionIndexCode("root000000");
+ //60-娑蹭綅 61-姘村帇
param.setResourceTypeCodes("60,61".split(","));
param.setIncludeDown("1");
param.setUserId("admin");
@@ -667,7 +668,7 @@
String pressure = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_PRESSURE_LEVEL).getCode();
String liquid = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_LIQUID_LEVEL).getCode();
String pressureUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.PRESSURE_LEVEL_UNIT).getCode();
- String liquidUnit = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
+ String liquidUnit = systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LIQUID_LEVEL_UNIT).getCode();
if(response != null && StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)
&& response.getData()!=null ) {
List<MonitorDataSearchResponse> r = response.getData().getList();
@@ -675,12 +676,15 @@
for(MonitorDataSearchResponse model : r){
MonitorDataVO m = new MonitorDataVO();
m.setName(model.getName());
+ m.setType(model.getType());
// m.setLevel(Constants.equalsInteger(model.getType(),60)?liquid:pressure);
- m.setLevel(getLevelDataByDeviceName(model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
+ m.setLevel(getLevelDataByDeviceName(m,model.getName(),Constants.equalsInteger(model.getType(),60)?liquidUnit:pressureUnit));
m.setDataList(new ArrayList<>());
if(model.getValues()!=null){
List<MonitorDataInfoVO> dataList = new ArrayList<>();
for(MonitorDataValResponse v : model.getValues()){
+ //娑插帇鍥哄畾鍊硷細254001
+ //姘村帇鍥哄畾鍊硷細253958
if(Constants.equalsInteger(model.getType(),60)){
if(v.getMonitorTypeCode().equals("254001")){
MonitorDataInfoVO vm = new MonitorDataInfoVO();
@@ -712,7 +716,7 @@
return list;
}
- private String getLevelDataByDeviceName(String name,String unit) {
+ private String getLevelDataByDeviceName(MonitorDataVO m,String name,String unit) {
/**
* {
@@ -744,7 +748,9 @@
&& response.getData()!=null ) {
String min = response.getData().getList().get(0).getFireproChannelMinValue();
String max = response.getData().getList().get(0).getFireproChannelMaxvalue();
- r =StringUtils.defaultString(min,"-")+"~"+StringUtils.defaultString(max,"-") +unit;
+ m.setMax(max);
+ m.setMin(min);
+ r =StringUtils.defaultString(min,"-")+"锝�"+StringUtils.defaultString(max,"-") +unit;
}
return r;
@@ -1020,10 +1026,11 @@
Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
List<PlatformJob> monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
- .selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getType,PlatformJob::getType)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
- .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .selectAs(PlatformJob::getDoneDate,PlatformJob::getDoneDate)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getType,PlatformJob::getType)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),
@@ -1219,15 +1226,19 @@
}
if(CollectionUtils.isNotEmpty(jobList)){
//鑾峰彇浠诲姟鏁版嵁
- List<String> jobDataList = list.stream().filter(i->Objects.nonNull(i.getDoneDate())).map(i->DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd")).collect(Collectors.toList());
- for (String jobDate:jobDataList) {
- //杩囨护褰撳ぉ鐨勬暟鎹�
- List<PlatformJob> platformJobList = list.stream().
- filter(i->jobDate.equals(DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd"))).collect(Collectors.toList());
- if(CollectionUtils.isNotEmpty(platformJobList)){
- //鑾峰彇浠婂ぉ鐨�
- r = r.add(this.getDayTotalRata(getSumTotalByList(platformJobList,type,null),jobDate));
+ List<String> jobDataList = jobList.stream().filter(i->Objects.nonNull(i.getDoneDate()))
+ .map(i->DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd")).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(jobDataList)){
+ for (String jobDate:jobDataList) {
+ //杩囨护褰撳ぉ鐨勬暟鎹�
+ List<PlatformJob> platformJobList = list.stream().
+ filter(i->jobDate.equals(DateUtil.formatDate(i.getDoneDate(),"yyyy-MM-dd"))).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(platformJobList)){
+ //鑾峰彇浠婂ぉ鐨�
+ r = r.add(this.getDayTotalRata(getSumTotalByList(platformJobList,type,null),jobDate));
+ }
}
+ r = r.divide(new BigDecimal(Integer.toString(jobList.size())),2,BigDecimal.ROUND_HALF_UP);
}
}
return r;
@@ -1239,7 +1250,7 @@
//鏌ヨ浠婃棩鏈�鏃�/鏈�鏅氱殑浣滀笟鏁版嵁
List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>()
.lambda()
- .apply(" ( to_days(param1) = '"+today+"' or to_days(param2) = '"+today+"' ) ")
+ .apply(" ( DATE_FORMAT( param1 ,'%Y-%m-%d' ) = '"+today+"' or DATE_FORMAT( param2 ,'%Y-%m-%d' ) = '"+today+"' ) ")
);
if(totalAmount.compareTo(BigDecimal.ZERO)==0||CollectionUtils.isEmpty(platformLogList)){
return BigDecimal.ZERO;
--
Gitblit v1.9.3