计算电量算法

web/health/src/main/java/com/gyee/health/controller/health/HealthReportController.java

@@ -5,7 +5,11 @@ import com.gyee.health.dto.AjaxStatus;
 import com.gyee.health.model.auto.ProBasicFeatureStat;
 import com.gyee.health.model.auto.ProEconHealthReportMain;
 import com.gyee.health.model.auto.ProEconHealthReportTarget;
-import com.gyee.health.model.vo.*;
+import com.gyee.health.model.vo.DataVlueVo;
+import com.gyee.health.model.vo.EquipmentInfoDayTopVo;
+import com.gyee.health.model.vo.HealthNumVo;
+import com.gyee.health.model.vo.StateJudgmentVo;
+import com.gyee.health.service.ShutdownEventService;
 import com.gyee.health.service.health.HealthReportService;
 import com.gyee.health.util.DateUtils;
 import com.gyee.health.util.StringUtils;
@@ -19,7 +23,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Controller
 @RequestMapping("/healthreport")
@@ -28,6 +35,8 @@ public class HealthReportController {
 
     @Resource
     private HealthReportService healthReportService;
+    @Resource
+    private ShutdownEventService shutdownEvent2Service;
 
     @GetMapping("/getEconHealthReportMain")
     @ResponseBody
@@ -218,4 +227,28 @@ public class HealthReportController {
         }
 
     }
+
+
+    @GetMapping("/getAlarmcountCtVoList")
+    @ResponseBody
+    @ApiOperation(value = "获得报警部件次数统计", notes = "获得报警部件次数统计")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "wtId", value = "设备编号", required = true, dataType = "string", paramType = "query"),
+            @ApiImplicitParam(name = "recordDate", value = "日期", required = true, dataType = "string", paramType = "query")})
+    public AjaxResult getAlarmcountCtVoList(String recordDate, String wtId) throws Exception {
+
+
+        List<ProBasicFeatureStat> vos = new ArrayList<>();
+
+        if (StringUtils.notEmp(recordDate) && StringUtils.notEmp(wtId)) {
+            vos = healthReportService.findCtFeatureStat(DateUtils.parseDate(recordDate), wtId);
+
+        }
+        if (null != vos) {
+            return AjaxResult.successData(AjaxStatus.success.code, vos);
+        } else {
+            return AjaxResult.successData(AjaxStatus.error.code, vos);
+        }
+
+    }
 }

web/health/src/main/java/com/gyee/health/mapper/auto/AlarmTsMapper.java

@@ -261,7 +261,7 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
             "</where>",
 
             " group by deviceid,components,stationid,alarmid,description ",
-            " order by deviceid , total desc  limit 1,30",
+            " order by deviceid , total desc  ",
             "</script>"})
     List<ProBasicFeatureStat> findWtFeatureStatWt(@Param("superTableName") String superTableName, @Param("begin")long begin, @Param("end") long end, @Param("deviceid") String deviceid);
 
@@ -271,15 +271,9 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
 
             " ts &gt;= #{begin}",
             "and ts &lt;= #{end}",
-            "and stationid = #{stationid}",
-            "and modelId = #{modelId}",
+
             "and deviceid = #{wtId}",
-            "<if test='alarmid != null'>",
-            "and alarmid in(${alarmid}) ",
-            "</if>",
-            "<if test='components != null'>",
-            "and components in(${components}) ",
-            "</if>",
+
             "<if test='deviceType != null'>",
             "and deviceType = #{deviceType}",
             "</if>",
@@ -288,7 +282,7 @@ public interface AlarmTsMapper extends BaseMapper<AlarmTs> {
             " group by deviceid,components,stationid,alarmid,description ",
             " order by deviceid, total desc ",
             "</script>"})
-    List<ProBasicFeatureStat> findCtFeatureStat(@Param("wtId") String wtId, @Param("begin")long begin, @Param("end") long end, @Param("stationid") String stationid, @Param("modelId")String modelId, @Param("components") String components, @Param("alarmid") String alarmid, @Param("deviceType")String deviceType);
+    List<ProBasicFeatureStat> findCtFeatureStat(@Param("wtId") String wtId, @Param("begin")long begin, @Param("end") long end, @Param("deviceType")String deviceType);
 
     @Select("${sql}")
     List<AlarmSimpleVo> selectLastRowByTbname(@Param("sql") String sql);

web/health/src/main/java/com/gyee/health/service/health/AlarmHistoryService.java

@@ -5,10 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.gyee.health.init.CacheContext;
 import com.gyee.health.mapper.auto.AlarmTsMapper;
 import com.gyee.health.model.auto.*;
-import com.gyee.health.model.vo.AlarmStatVo;
-import com.gyee.health.model.vo.AlarmSuperTalbeType;
-import com.gyee.health.model.vo.AlarmTime;
-import com.gyee.health.model.vo.AlarmTypeValue;
+import com.gyee.health.model.vo.*;
 import com.gyee.health.util.DateUtils;
 import com.gyee.health.util.SnowflakeGenerator;
 import com.gyee.health.util.StringUtils;
@@ -75,11 +72,6 @@ public class AlarmHistoryService {
         }
 
 
-
-
-
-
-
         return fsls;
     }
     private  static void setWtValues(Date statDate,Map<String, ProBasicFeatureStat> map, List<ProBasicFeatureStat> vos, ProBasicEquipment wt, ProEconAlarmConfiguration at) {
@@ -113,55 +105,19 @@ public class AlarmHistoryService {
         vos.add(fs);
     }
 
-    public List<AlarmStatVo> findCtFeatureStat(String wtId,String stationId,String modelId, Date startTime, Date endTime,String components,String deviceType,String alarmIds,String timeType) {
-        List<AlarmStatVo> resultList = new ArrayList<>();
+    public List<ProBasicFeatureStat> findCtFeatureStat(String wtId,  Date startTime, Date endTime) {
+        List<ProBasicFeatureStat> resultList = new ArrayList<>();
 
 
-        StringBuilder alarmIdList=new StringBuilder();
-        StringBuilder componentsList=new StringBuilder();
-
-        Map<String,String> alarmIdMap=new HashMap<>();
-        Map<String,String> componentsMap=new HashMap();
-
-        if(StringUtils.notEmp(components))
-        {
-            String [] componentsStr=components.split(",");
-            for(String c:componentsStr)
-            {
-                componentsList.append("'").append(c).append("',");
-                componentsMap.put(c,c);
-            }
-
-        }
-        if(StringUtils.notEmp(alarmIds))
-        {
-            String [] alarmIdStr=alarmIds.split(",");
-            for(String c:alarmIdStr)
-            {
-                alarmIdList.append("'").append(c).append("',");
-                alarmIdMap.put(c,c);
-            }
-
-        }
-        String alarmId=null;
-        String component=null;
-        if(alarmIdList.length()>0)
-        {
-            alarmId=String.valueOf(alarmIdList.substring(0,alarmIdList.length()-1));
-        }
-        if(componentsList.length()>0)
-        {
-            component=String.valueOf(componentsList.substring(0,componentsList.length()-1));
-        }
-        List<ProBasicFeatureStat> fsls = alarmTsMapper.findCtFeatureStat(wtId,startTime.getTime(), endTime.getTime(),stationId,modelId,component,alarmId,deviceType);
+        List<ProBasicFeatureStat> fsls = alarmTsMapper.findCtFeatureStat(wtId,startTime.getTime(), endTime.getTime(), AlarmCustomType.WT.getCode());
 
 
         Map<String, ProBasicFeatureStat> map = new HashMap<>();
-        Date statDate=DateUtils.truncate(new Date());
+        Date statDate= DateUtils.truncate(new Date());
 
         if (!fsls.isEmpty()) {
             for (ProBasicFeatureStat fs : fsls) {
-                if (StringUtils.notEmp(fs.getTypeCode()) && CacheContext.alarmTypeMap.containsKey(fs.getTypeCode())) {
+                if (com.gyee.common.model.StringUtils.notEmp(fs.getTypeCode()) && CacheContext.alarmTypeMap.containsKey(fs.getTypeCode())) {
                     ProEconAlarmType at = CacheContext.alarmTypeMap.get(fs.getTypeCode());
                     fs.setTypeName(at.getName());
                 }
@@ -172,123 +128,32 @@ public class AlarmHistoryService {
                 map.put(String.valueOf(sb), fs);
             }
         }
-        List<ProBasicFeatureStat> vos = new ArrayList<>();
-
-        if(CacheContext.wpwtmap.containsKey(stationId))
-        {
-            List<ProBasicEquipment> wtls=CacheContext.wpwtmap.get(stationId);
-            for (ProBasicEquipment wt : wtls) {
-
-                StringBuilder sb=new StringBuilder();
-                sb.append(wt.getWindpowerstationId()).append(wt.getModelId());
-
-                if(CacheContext.ctAlarmlsMap.containsKey(String.valueOf(sb))) {
-
-                    List<ProEconAlarmRule> wtCustomls=CacheContext.ctAlarmlsMap.get(String.valueOf(sb));
-
-                    for (ProEconAlarmRule at : wtCustomls) {
-
-                        if(StringUtils.notEmp(components) )
-                        {
-                            if(componentsMap.containsKey(at.getRelatedParts()) )
-                            {
-                                if(StringUtils.notEmp(alarmIdMap) && !alarmIdMap.isEmpty())
-                                {
-                                    if( alarmIdMap.containsKey(at.getId()))
-                                    {
-                                        setCtValues(statDate, map, vos, wt, at);
-                                    }
-
-                                }else
-                                {
-                                    setCtValues(statDate, map, vos, wt, at);
-                                }
-                            }
-                        }else
-                        {
-                            setCtValues(statDate, map, vos, wt, at);
-                        }
-
-                    }
-
-                }
-            }
-        }
 
 
-        Map<String,List<AlarmStatVo>> vomap=new HashMap<>();
-        for(ProBasicFeatureStat fs:vos)
-        {
-            AlarmStatVo d = new AlarmStatVo();
-            d.setRelateParts(fs.getTypeCode());
-            d.setRelatePartsText(fs.getTypeName());
-            d.setAlertText(fs.getDescription());
-            d.setCount(fs.getTotal());
-            if(StringUtils.notEmp(timeType))
-            {
-                if(AlarmTime.H.getCode().equals(timeType))
-                {
-                    double times= new BigDecimal(fs.getTotalSeconds()).divide(new BigDecimal(360), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    d.setTime(times);
-                }else if(AlarmTime.M.getCode().equals(timeType))
-                {
-                    double times= new BigDecimal(fs.getTotalSeconds()).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue();
-                    d.setTime(times);
-                }else
-                {
-                    d.setTime(fs.getTotalSeconds());
-                }
-            }else
-            {
-                double times= new BigDecimal(fs.getTotalSeconds()).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue();
-                d.setTime(times);
-            }
-            d.setStationId(fs.getStationId());
-            d.setSnapId(SnowflakeGenerator.generateId());
-            d.setWindturbineId(fs.getWtId());
-            if(CacheContext.wtmap.containsKey(fs.getWtId()))
-            {
-                ProBasicEquipment wt= CacheContext.wtmap.get(fs.getWtId());
-                d.setWindturbineCode(wt.getNemCode());
-            }
-
-            StringBuilder sb=new StringBuilder();
-            sb.append(fs.getWtId()).append("_").append(fs.getTypeCode()).append("_").append(fs.getAlarmid());
+        return resultList;
+    }
 
-            if(map.containsKey(String.valueOf(sb)))
-            {
-                List<AlarmStatVo> ls=vomap.get(String.valueOf(sb));
-                ls.add(d);
-            }else
-            {
-                List<AlarmStatVo> ls=new ArrayList<>();
-                ls.add(d);
-                vomap.put(String.valueOf(sb),ls);
-            }
-            resultList.add(d);
-        }
 
 
-        return resultList;
-    }
     private  static void setCtValues(Date statDate,Map<String, ProBasicFeatureStat> map, List<ProBasicFeatureStat> vos, ProBasicEquipment wt, ProEconAlarmRule at) {
 
         ProBasicFeatureStat fs = new ProBasicFeatureStat();
 
         StringBuilder sb = new StringBuilder();
-        sb.append(fs.getWtId()).append("_").append(at.getId());
+        sb.append(wt.getId()).append("_").append(at.getId());
         if (map.containsKey(String.valueOf(sb))) {
             ProBasicFeatureStat old = map.get(String.valueOf(sb));
             BeanUtil.copyProperties(old, fs);
+            fs.setAlarmid(old.getAlarmid());
         } else {
             fs.setStatDate(new Timestamp(statDate.getTime()));
             fs.setId(String.valueOf(SnowflakeGenerator.generateId()));
             fs.setWtId(wt.getId());
             fs.setStationId(wt.getWindpowerstationId());
-            fs.setTypeCode(at.getCategory());
-            if(CacheContext.alarmTypeMap.containsKey(at.getCategory()))
+            fs.setTypeCode(at.getRelatedParts());
+            if(CacheContext.alarmTypeMap.containsKey(at.getRelatedParts()))
             {
-                fs.setTypeName(CacheContext.alarmTypeMap.get(at.getCategory()).getName());
+                fs.setTypeName(CacheContext.alarmTypeMap.get(at.getRelatedParts()).getName());
             }
             fs.setAlarmid(at.getId());
             fs.setDescription(at.getDescription());
@@ -301,4 +166,6 @@ public class AlarmHistoryService {
         }
         vos.add(fs);
     }
+
+
 }

web/health/src/main/java/com/gyee/health/service/health/HealthReportService.java

@@ -285,19 +285,19 @@ public class HealthReportService {
             Calendar c = Calendar.getInstance();
             c.setTime(recordDate);
             Date endDate = c.getTime();
-            c.add(Calendar.DAY_OF_MONTH, -1);
+            c.add(Calendar.DAY_OF_MONTH, -3);
             Date beginDate = DateUtils.truncate(c.getTime());
 
             HealthNumVo vo1 = new HealthNumVo();
-            vo1.setDateRange("1天");
+            vo1.setDateRange("3天");
             getHealthNumVo(vo1, wt, endDate, beginDate);
             vos.add(vo1);
             c.setTime(recordDate);
             endDate = c.getTime();
-            c.add(Calendar.DAY_OF_MONTH, -3);
+            c.add(Calendar.DAY_OF_MONTH, -7);
             beginDate = DateUtils.truncate(c.getTime());
             HealthNumVo vo2 = new HealthNumVo();
-            vo2.setDateRange("3天");
+            vo2.setDateRange("7天");
             getHealthNumVo(vo2, wt, endDate, beginDate);
             vos.add(vo2);
             c.setTime(recordDate);
@@ -305,7 +305,7 @@ public class HealthReportService {
             c.set(Calendar.DAY_OF_MONTH, 1);
             beginDate = DateUtils.truncate(c.getTime());
             HealthNumVo vo3 = new HealthNumVo();
-            vo3.setDateRange("统计期内");
+            vo3.setDateRange("当月");
             getHealthNumVo(vo3, wt, endDate, beginDate);
             vos.add(vo3);
         }
@@ -640,7 +640,7 @@ public class HealthReportService {
 
         ProBasicEquipmentPoint fjjkzt = proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.JKZT003);
         //发电机不良健康状态统计
-        List<PointData> fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600l);
+        List<PointData> fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60l);
         Double fdj = 0.0;
 
         if (!fjjkztls.isEmpty()) {
@@ -653,7 +653,7 @@ public class HealthReportService {
         vo.setFdj(fdj.intValue());
         fjjkzt = proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.JKZT002);
         //齿轮箱不良健康状态统计
-        fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600l);
+        fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60l);
         Double clx = 0.0;
 
         if (!fjjkztls.isEmpty()) {
@@ -666,7 +666,7 @@ public class HealthReportService {
         vo.setClx(clx.intValue());
         fjjkzt = proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.JKZT004);
         //变桨不良健康状态统计
-        fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600l);
+        fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60l);
         Double bj = 0.0;
 
         if (!fjjkztls.isEmpty()) {
@@ -680,7 +680,7 @@ public class HealthReportService {
 
         fjjkzt = proBasicEquipmentPointService.getEquipmentPoint(wt.getId(), ContantXk.JKZT005);
         //主轴不良健康状态统计
-        fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 3600l);
+        fjjkztls = realApiUtil.getHistoryDatasSnap(fjjkzt.getNemCode(), beginDate.getTime() / 1000, endDate.getTime() / 1000, null, 60l);
         Double zz = 0.0;
 
         if (!fjjkztls.isEmpty()) {
@@ -723,6 +723,32 @@ public class HealthReportService {
     }
 
     /**
+     * 获得报警部件次数统计
+     *
+     * @param recordDate
+     * @param wtId
+     * @return
+     */
+    public List<ProBasicFeatureStat> findCtFeatureStat(Date recordDate, String wtId) {
+
+        List<ProBasicFeatureStat> vos = new ArrayList<>();
+        if (StringUtils.notEmp(recordDate) && StringUtils.notEmp(wtId)) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(DateUtils.truncate(recordDate));
+
+            Date end = c.getTime();
+            c.set(Calendar.DAY_OF_MONTH, 1);
+            Date begin = c.getTime();
+
+            ProBasicEquipment wt = CacheContext.wtmap.get(wtId);
+
+            vos = alarmHistoryService.findCtFeatureStat(wtId,begin, end);
+
+        }
+        return vos;
+    }
+
+    /**
      * 获得曲线偏差率列表
      *
      * @param recordDate