diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/BusiEqmWarningMapper.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/BusiEqmWarningMapper.java index 1ea1133..4271f44 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/BusiEqmWarningMapper.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapper/BusiEqmWarningMapper.java @@ -43,7 +43,7 @@ import com.huatek.busi.vo.warning.BusiHomePageWarningVo; * 按类型获取最近的告警数量 *sensorCode * */ - Integer getCurrentWarningSum(@Param("sensorCode") String sensorCode, @Param("eqType") String eqType, @Param("gzType") String gzType); + Integer getCurrentWarningSum(@Param("mainTreeId") String mainTreeId, @Param("sensorCode") String sensorCode, @Param("eqType") String eqType, @Param("gzType") String gzType); Integer getBusiEqmWarningCount(Map param); diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml index 0499699..11060d2 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/mapping/BusiEqmWarningMapping.xml @@ -389,8 +389,8 @@ t.mainTreeId AS mainTreeId, t.warningId AS warningId, t.siteId as siteId, - t.sensorInstallLocation AS sensorInstallLocation, - CONCAT_WS(",",t.oName,t.cableName,t.tName,t.gName,t.aName,t.genName) as sensorName + t.sensorInstallLocation AS sensorInstallLocation +-- CONCAT_WS(",",t.oName,t.cableName,t.tName,t.gName,t.aName,t.genName) as sensorName from ( select warn.id AS warningId, @@ -401,13 +401,13 @@ warn.warning_time AS warningTime, warn.main_tree_id AS mainTreeId, warn.site_id as siteId, - warn.sensor_install_location AS sensorInstallLocation, - ( select os.sensor_name from busi_other_sensor os where os.sensor_code=warn.sensor_id and os.status= '1') as oName, + warn.sensor_install_location AS sensorInstallLocation + /*( select os.sensor_name from busi_other_sensor os where os.sensor_code=warn.sensor_id and os.status= '1') as oName, ( select cable.sensor_name from busi_cable_sensor cable where cable.sensor_code=warn.sensor_id and cable.status= '1') as cableName, ( select ts.sensor_name from busi_transformer_sensor ts where ts.sensor_code=warn.sensor_id and ts.status= '1') as tName, ( select gs.sensor_name from busi_gis_sensor gs where gs.sensor_code=warn.sensor_id and gs.status= '1') as gName, ( select asensor.sensor_name from busi_arrester_sensor asensor where asensor.sensor_code=warn.sensor_id and asensor.status= '1') as aName, - ( select generator.sensor_name from busi_generator_sensor generator where generator.sensor_code=warn.sensor_id and generator.status= '1') as genName + ( select generator.sensor_name from busi_generator_sensor generator where generator.sensor_code=warn.sensor_id and generator.status= '1') as genName*/ from busi_eqm_warning warn @@ -419,10 +419,33 @@ AND warn.gz_type = #{gzType} - GROUP BY warn.sensor_id + GROUP BY warn.sensor_id,warn.main_tree_id ORDER BY warn.warning_time DESC ) t + @@ -441,6 +464,9 @@ b.del_flag = '1' AND b.deal_status = '0' + + and b.main_tree_id = #{mainTreeId} + AND (b.sensor_id = #{sensorCode} OR b.sensor_id is NULL) diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java index 543eae7..6b1160e 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/BusiEqmWarningServiceImpl.java @@ -2,16 +2,15 @@ package com.huatek.busi.service.impl; import java.text.DecimalFormat; import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import com.alibaba.dubbo.config.annotation.Reference; import com.alibaba.fastjson.JSONObject; import com.huatek.busi.common.BusiConstant; import com.huatek.busi.dto.PushAlarmsDto; import com.huatek.busi.entity.*; +import com.huatek.busi.mapper.BusiSiteMapper; +import com.huatek.busi.mapper.BusiSiteTreeMapper; import com.huatek.busi.service.*; import com.huatek.busi.service.arrester.BusiArresterSensorService; import com.huatek.busi.service.gis.BusiGisSensorService; @@ -70,6 +69,12 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { @Autowired private BusiEqmWarningDao busiEqmWarningDao; + @Autowired + private BusiSiteMapper busiSiteMapper; + + @Autowired + private BusiSiteTreeMapper busiSiteTreeMapper; + @Autowired private BusiEqmMalfunctionService busiEqmMalfunctionService; @@ -321,10 +326,23 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { private void setData(BusiHomePageWarningVo warning) { + if(BusiConstant.GzType.GZ_TYPE25.equals(warning.getGzType())) { + String siteId = busiSiteMapper.getSiteInfo().getId(); + BusiSiteTree busiSiteTree = busiSiteTreeMapper.findByMainEquipmentIdAndSiteId(warning.getMainTreeId(), siteId); + if ( null != busiSiteTree ) { + warning.setSensorName(busiSiteTree.getName()); + String msg = warning.getWarningMsg(); + int i = msg.indexOf("-"); + if (-1 != i) { + warning.setWarningMsg(warning.getSensorName()+"-"+warning.getWarningMsg().substring(0,i)); + } + } + + } if(BusiConstant.EqType.EQ_TYPE1.equals(warning.getEqType())) { if (BusiConstant.GzType.GZ_TYPE9.equals(warning.getGzType())) { - warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getSensorCode(), warning.getEqType(), warning.getGzType())); + warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getMainTreeId() ,warning.getSensorCode(), warning.getEqType(), warning.getGzType())); return; } if(!StringUtils.isEmpty(warning.getSensorCode())){ @@ -402,7 +420,7 @@ public class BusiEqmWarningServiceImpl implements BusiEqmWarningService { warning.setPosition(busiCableSensor.getPosition()); } } - warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getSensorCode(), warning.getEqType(), warning.getGzType())); + warning.setWarningCount(busiEqmWarningMapper.getCurrentWarningSum(warning.getMainTreeId() ,warning.getSensorCode(), warning.getEqType(), warning.getGzType())); } @Override diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperChartsServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperChartsServiceImpl.java index 2fbda1f..80edc19 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperChartsServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/temperature/RptTemperChartsServiceImpl.java @@ -104,6 +104,30 @@ public class RptTemperChartsServiceImpl implements RptTemperChartsService { rptTemperCharts.setCoTemper(item.getTmp()); rptTemperCharts.setCoSensorId(item.getSensorCode()); break; + case A_S: + rptTemperCharts.setAsTemper(item.getTmp()); + rptTemperCharts.setAsSensorId(item.getSensorCode()); + break; + case B_S: + rptTemperCharts.setBsTemper(item.getTmp()); + rptTemperCharts.setBsSensorId(item.getSensorCode()); + break; + case C_S: + rptTemperCharts.setCsTemper(item.getTmp()); + rptTemperCharts.setCsSensorId(item.getSensorCode()); + break; + case A_X: + rptTemperCharts.setAxTemper(item.getTmp()); + rptTemperCharts.setAxSensorId(item.getSensorCode()); + break; + case B_X: + rptTemperCharts.setBxTemper(item.getTmp()); + rptTemperCharts.setBxSensorId(item.getSensorCode()); + break; + case C_X: + rptTemperCharts.setCxTemper(item.getTmp()); + rptTemperCharts.setCxSensorId(item.getSensorCode()); + break; case IN_SIDE: rptTemperCharts.setBoxTemper(item.getTmp()); rptTemperCharts.setBoxSensorId(item.getSensorCode());