故障接口修改

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/common/util/DateUtil.java

@@ -62,6 +62,7 @@ public class DateUtil {
         return time;
     }
 
+
     /**
      * 字符串时间转时间戳
      * @param time

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/model/kudu/Casefault.java

@@ -1,5 +1,8 @@
 package com.gyee.sampleimpala.model.kudu;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
@@ -21,34 +24,53 @@ public class Casefault extends Model<Casefault> {
 
     private static final long serialVersionUID=1L;
 
-      private String id;
+    @TableId(value = "id", type = IdType.INPUT)
+    @TableField("id")
+    private String id;
 
+    @TableField("tag")
     private Integer tag;
 
+    @TableField("faultid")
+    private Long faultid;
+
+    @TableField("stationcn")
     private String stationcn;
 
+    @TableField("windturbineid")
     private String windturbineid;
 
+    @TableField("faulttype")
     private String faulttype;
 
+    @TableField("faultcode")
     private String faultcode;
 
+    @TableField("symptom")
     private String symptom;
 
+    @TableField("symptomcode")
     private String symptomcode;
 
+    @TableField("starttime")
     private String starttime;
 
+    @TableField("endtime")
     private String endtime;
 
+    @TableField("manufacturer")
     private String manufacturer;
 
+    @TableField("model")
     private String model;
 
+    @TableField("stationen")
     private String stationen;
 
+    @TableField("remark")
     private String remark;
 
+    @TableField("category")
     private String category;
 
 
@@ -57,4 +79,6 @@ public class Casefault extends Model<Casefault> {
         return this.id;
     }
 
+
+
 }

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/schdule/TaskPerformance.java

@@ -4,6 +4,7 @@ import com.gyee.sampleimpala.common.constant.Constants;
 import com.gyee.sampleimpala.common.feign.RemoteServiceBuilder;
 import com.gyee.sampleimpala.common.util.DateUtil;
 import com.gyee.sampleimpala.model.custom.TsPointData;
+import com.gyee.sampleimpala.model.kudu.Windturbine;
 import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
 import com.gyee.sampleimpala.service.kudu.WindpowerstationService;
 import com.gyee.sampleimpala.service.kudu.WindturbineService;
@@ -19,13 +20,16 @@ import java.util.List;
 @Slf4j
 public class TaskPerformance {
 
+    // 分钟 * 秒
+    private final Integer inteval = 5 * 60;
     @Autowired
     private RemoteServiceBuilder remoteServiceBuilder;
     @Autowired
+    private WindturbineService windturbineService;
+    @Autowired
     private WindturbinepointService windturbinepointService;
 
 
-
     /**
      * 性能下降统计
      * 延时30s执行
@@ -33,17 +37,25 @@ public class TaskPerformance {
      */
 //    @Scheduled(initialDelay = 30 * 1000, fixedRate = 60 * 1000)
     public void performanceDown(){
-        List<Windturbinepoint> nssFdc = windturbinepointService.getAllByStationAndUniformCode("NSS_FDC", Constants.FDJZS);
-        List<Windturbinepoint> ztFdc = windturbinepointService.getAllByStationAndUniformCode("NSS_FDC", Constants.FJMXZT);
-        List<Windturbinepoint> qfFdc = windturbinepointService.getAllByStationAndUniformCode("NSS_FDC", Constants.RSSQFZT);
-
-        String point_nss_zs = "NSSFJ.NX_GD_NSSF_FJ_P1_L1_001_AI0012";
-        String point_nss_zt = "NSSFJJSFW.NX_GD_NSSF_FJ_P1_L1_001_CI0169";
-
-        List<TsPointData> zsData = remoteServiceBuilder.ShardingService().getHistoryRaw(point_nss_zs,
-                DateUtil.covertDateTimestamp("2021-11-01 00:00:00"), DateUtil.covertDateTimestamp("2021-11-01 00:30:00"));
-        List<TsPointData> ztData = remoteServiceBuilder.ShardingService().getHistoryRaw(point_nss_zt,
-                DateUtil.covertDateTimestamp("2021-11-01 00:00:00"), DateUtil.covertDateTimestamp("2021-11-01 00:30:00"));
+        List<Windturbinepoint> zs = windturbinepointService.getAllByStationAndUniformCode("NSS_FDC", Constants.FDJZS);
+        List<Windturbinepoint> zt = windturbinepointService.getAllByStationAndUniformCode("NSS_FDC", Constants.FJMXZT);
+        List<Windturbinepoint> qf = windturbinepointService.getAllByStationAndUniformCode("NSS_FDC", Constants.RSSQFZT);
+
+        List<Windturbine> listNSS = windturbineService.getWindTurbineId("NSS_FDC");
+
+        if (listNSS == null || listNSS.size() < 0)
+            return;
+
+        for (int i = 0; i < listNSS.size(); i++){
+            // zhi
+            if (i > 2)
+                break;
+//
+//            List<TsPointData> zsData = remoteServiceBuilder.ShardingService().getHistorySnap(zs,
+//                    DateUtil.covertDateTimestamp("2021-11-01 00:00:00"), DateUtil.covertDateTimestamp("2021-11-01 00:30:00"));
+//            List<TsPointData> ztData = remoteServiceBuilder.ShardingService().getHistoryRaw(point_nss_zt,
+//                    DateUtil.covertDateTimestamp("2021-11-01 00:00:00"), DateUtil.covertDateTimestamp("2021-11-01 00:30:00"));
+        }
     }
 
 }

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/CasefaultServiceImpl.java

@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -39,10 +40,15 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
     public List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et, String[] ids) {
         ExcludeQueryWrapper<Casefault> wrapper = new ExcludeQueryWrapper<>();
 
+        List<Long> collect = null;
+        // string数组转成List<Long>
+        if (ids != null)
+            collect = Arrays.stream(ids).map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+
         wrapper.eq("stationen", station)
                 .in("model", model)
-                .in("faultcode", ids)
-                .in("faultid", ids)
+                .in("faultcode", widget)
+                .in("faultid", collect)
                 .ge("starttime", st)
                 .le("endtime", et);
 
@@ -57,12 +63,25 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
         return list;
     }
 
+
+    @Transactional
     @Override
     public boolean insertOrUpdate(List<Casefault> list) {
         boolean flag = false;
 
+        if (list == null || list.size() < 0)
+            return flag;
+
         try{
+            for (Casefault fault : list){
+                if (StringUtils.isEmpty(fault.getId())) {
+                    // 新增
+                    fault.setId(SnowFlakeGenerator.generateId());
+                }
+            }
+
             flag = saveOrUpdateBatch(list);
+
         } catch (CustomException e) {
             log.error(e.getMessage());
             throw new CustomException(ResultCode.ERROR_DATA);

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/service/impl/kudu/WindturbineServiceImpl.java

@@ -60,6 +60,7 @@ public class WindturbineServiceImpl extends ServiceImpl<WindturbineMapper, Windt
         try {
             QueryWrapper<Windturbine> wrapper = new QueryWrapper<>();
             wrapper.eq("station", station);
+            wrapper.orderByAsc("id");
 
             list = baseMapper.selectList(wrapper);
 

gyee-sample-impala/src/main/resources/mapper/CasefaultMapper.xml

@@ -6,6 +6,7 @@
     <resultMap id="BaseResultMap" type="com.gyee.sampleimpala.model.kudu.Casefault">
         <id column="id" property="id" />
         <result column="tag" property="tag" />
+        <result column="faultid" property="faultid" />
         <result column="stationcn" property="stationcn" />
         <result column="windturbineid" property="windturbineid" />
         <result column="faulttype" property="faulttype" />