接口修改

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/CaseFaultAlgController.java

@@ -29,7 +29,7 @@ public class CaseFaultAlgController {
      * @return
      */
     @GetMapping("/fault/train/all")
-    public JSONObject stationAll(String... ids){
+    public JSONObject faultAll(String[] ids){
         List<Casefaultalg> list = casefaultalgService.getAllByIds(ids);
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/CaseFaultController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.sampleimpala.common.result.JsonResult;
 import com.gyee.sampleimpala.common.result.ResultCode;
 import com.gyee.sampleimpala.model.kudu.Casefault;
+import com.gyee.sampleimpala.model.kudu.Casefaultalg;
 import com.gyee.sampleimpala.service.kudu.CasefaultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,24 +30,24 @@ public class CaseFaultController {
      * @param widget   故障部件
      * @param st       开始时间
      * @param et       结束时间
+     * @param ids      oracle关联的faultid
      * @return
      */
     @GetMapping("/fault/all")
-    public JSONObject stationAll(String station, String[] model, String[] widget,
-                                 String st, String et){
-        List<Casefault> list = casefaultService.getAll(station, model, widget, st, et);
+    public JSONObject faultAll(String station, String[] model, String[] widget,
+                                 String st, String et, String[] ids){
+        List<Casefault> list = casefaultService.getAll(station, model, widget, st, et, ids);
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 
-
     /**
-     * 新增样本案例
-     * @param obj
+     * 批量新增或修改数据
+     * @param list
      * @return
      */
-    @PostMapping("/item/insert")
-    public JSONObject stationInsert(@RequestBody Casefault obj){
-        boolean flag = casefaultService.insertItem(obj);
+    @PostMapping("/fault/insert")
+    public JSONObject faultInsert(@RequestBody List<Casefault> list){
+        boolean flag = casefaultService.insertOrUpdate(list);
         if (flag){
             return JsonResult.success(ResultCode.SUCCESS);
         }
@@ -54,6 +55,21 @@ public class CaseFaultController {
         return JsonResult.error(ResultCode.ERROR);
     }
 
+//    /**
+//     * 新增样本案例
+//     * @param obj
+//     * @return
+//     */
+//    @PostMapping("/item/insert")
+//    public JSONObject faultInsert(@RequestBody Casefault obj){
+//        boolean flag = casefaultService.insertItem(obj);
+//        if (flag){
+//            return JsonResult.success(ResultCode.SUCCESS);
+//        }
+//
+//        return JsonResult.error(ResultCode.ERROR);
+//    }
+
 
     /**
      * 编辑样本案例
@@ -61,7 +77,7 @@ public class CaseFaultController {
      * @return
      */
     @PostMapping("/item/edit")
-    public JSONObject stationEdit(@RequestBody Casefault obj){
+    public JSONObject faultEdit(@RequestBody Casefault obj){
         System.out.println(obj.toString());
         boolean flag = casefaultService.editItem(obj);
         if (flag){
@@ -79,7 +95,7 @@ public class CaseFaultController {
      */
     @PostMapping("/item/delete")
     @ResponseBody
-    public JSONObject stationDelete(String id){
+    public JSONObject faultDelete(String id){
         boolean flag = casefaultService.deleteItem(id);
         if (flag){
             return JsonResult.success(ResultCode.SUCCESS);
@@ -88,7 +104,4 @@ public class CaseFaultController {
         return JsonResult.error(ResultCode.ERROR);
     }
 
-
-
-
 }

gyee-sample-impala/src/main/java/com/gyee/sampleimpala/controller/WindturbinePointController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.gyee.sampleimpala.common.result.JsonResult;
 import com.gyee.sampleimpala.common.result.ResultCode;
 import com.gyee.sampleimpala.model.custom.TsPointData;
+import com.gyee.sampleimpala.model.kudu.Casefault;
 import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
 import com.gyee.sampleimpala.service.custom.GoldenService;
 import com.gyee.sampleimpala.service.kudu.WindturbinepointService;
@@ -34,8 +35,8 @@ public class WindturbinePointController {
     /**
      * 根据风机编号和部件查询关联测点
      *
-     * @param wtId
-     * @param widget
+     * @param wtId     风机ID  NG01_01
+     * @param widget   部件code  clx
      * @return
      */
     @GetMapping("/all")
@@ -60,4 +61,22 @@ public class WindturbinePointController {
         return JsonResult.successData(ResultCode.SUCCESS, list);
     }
 
+
+    /**
+     * 查询原始点数据
+     * @param station
+     * @param wtId
+     * @param model
+     * @param widget
+     * @param startTs
+     * @param endTs
+     * @return
+     */
+    @GetMapping("/data/all")
+    public JSONObject faultPointAll(String station, String wtId, String[] model, String[] widget, String startTs, String endTs){
+//        List<Casefault> list = windturbinepointService.getPointDataAll(station, wtId, model, widget, startTs, endTs);
+//        return JsonResult.successData(ResultCode.SUCCESS, list);
+        return null;
+    }
+
 }

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

@@ -21,7 +21,7 @@ public class Knowfaulttype extends Model<Knowfaulttype> {
 
     private static final long serialVersionUID=1L;
 
-      private String id;
+      private Long id;
 
     private String faulttype;
 

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

@@ -24,6 +24,8 @@ public class TaskPerformance {
     @Autowired
     private WindturbinepointService windturbinepointService;
 
+
+
     /**
      * 性能下降统计
      * 延时30s执行
@@ -31,8 +33,9 @@ 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> 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";

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

@@ -3,17 +3,23 @@ package com.gyee.sampleimpala.service.impl.kudu;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
 import com.gyee.sampleimpala.common.exception.CustomException;
+import com.gyee.sampleimpala.common.feign.RemoteServiceBuilder;
 import com.gyee.sampleimpala.common.result.ResultCode;
 import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
+import com.gyee.sampleimpala.model.custom.TsPointData;
 import com.gyee.sampleimpala.model.kudu.Casefault;
 import com.gyee.sampleimpala.mapper.kudu.CasefaultMapper;
+import com.gyee.sampleimpala.model.kudu.Casefaultalg;
 import com.gyee.sampleimpala.service.kudu.CasefaultService;
 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 java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -26,13 +32,17 @@ import java.util.List;
 @Service
 public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault> implements CasefaultService {
 
+    @Autowired
+    private RemoteServiceBuilder serviceBuilder;
 
     @Override
-    public List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et) {
+    public List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et, String[] ids) {
         ExcludeQueryWrapper<Casefault> wrapper = new ExcludeQueryWrapper<>();
+
         wrapper.eq("stationen", station)
                 .in("model", model)
-                .in("faultcode", widget)
+                .in("faultcode", ids)
+                .in("faultid", ids)
                 .ge("starttime", st)
                 .le("endtime", et);
 
@@ -48,6 +58,20 @@ public class CasefaultServiceImpl extends ServiceImpl<CasefaultMapper, Casefault
     }
 
     @Override
+    public boolean insertOrUpdate(List<Casefault> list) {
+        boolean flag = false;
+
+        try{
+            flag = saveOrUpdateBatch(list);
+        } catch (CustomException e) {
+            log.error(e.getMessage());
+            throw new CustomException(ResultCode.ERROR_DATA);
+        }
+
+        return flag;
+    }
+
+    @Override
     public boolean editItem(Casefault obj) {
         try {
             baseMapper.updateById(obj);

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

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 public class CasefaultalgServiceImpl extends ServiceImpl<CasefaultalgMapper, Casefaultalg> implements CasefaultalgService {
 
     @Override
-    public List<Casefaultalg> getAllByIds(String... ids) {
+    public List<Casefaultalg> getAllByIds(String[] ids) {
         List<Casefaultalg> list = new ArrayList<>();
         if (StringUtils.isEmpty(ids))
             return list;

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

@@ -1,6 +1,7 @@
 package com.gyee.sampleimpala.service.impl.kudu;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
 import com.gyee.sampleimpala.common.exception.CustomException;
 import com.gyee.sampleimpala.common.result.ResultCode;
 import com.gyee.sampleimpala.common.util.SnowFlakeGenerator;
@@ -12,6 +13,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -29,7 +31,10 @@ public class KnowfaulttypeServiceImpl extends ServiceImpl<KnowfaulttypeMapper, K
     public List<Knowfaulttype> getAll() {
         List<Knowfaulttype> list = new ArrayList<>();
         try {
-            list = baseMapper.selectList(null);
+            ExcludeQueryWrapper<Knowfaulttype> wrapper = new ExcludeQueryWrapper<>();
+            wrapper.orderByAsc("id");
+            list = baseMapper.selectList(wrapper);
+            list.sort(Comparator.comparing(Knowfaulttype::getId));
         } catch (CustomException e){
             log.error(e.getMessage());
             throw new CustomException(ResultCode.ERROR_DATA);
@@ -55,8 +60,8 @@ public class KnowfaulttypeServiceImpl extends ServiceImpl<KnowfaulttypeMapper, K
     public boolean insertItem(Knowfaulttype obj) {
         try {
             // 设置一个新ID
-            if (obj != null && StringUtils.isEmpty(obj.getId()))
-                obj.setId(SnowFlakeGenerator.generateId());
+            if (obj != null && obj.getId() <= 0)
+                obj.setId(Long.valueOf(SnowFlakeGenerator.generateId()));
 
             // 判断该类型是否已经存在
             QueryWrapper<Knowfaulttype> query = new QueryWrapper<>();

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

@@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.gyee.sampleimpala.common.base.ExcludeQueryWrapper;
 import com.gyee.sampleimpala.common.exception.CustomException;
 import com.gyee.sampleimpala.common.result.ResultCode;
+import com.gyee.sampleimpala.model.kudu.Casefault;
 import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
 import com.gyee.sampleimpala.mapper.kudu.WindturbinepointMapper;
+import com.gyee.sampleimpala.service.kudu.CasefaultService;
 import com.gyee.sampleimpala.service.kudu.WindturbinepointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +29,10 @@ import java.util.List;
 @Service
 public class WindturbinepointServiceImpl extends ServiceImpl<WindturbinepointMapper, Windturbinepoint> implements WindturbinepointService {
 
+    @Autowired
+    private CasefaultService casefaultService;
+
+
     @Cacheable(value = "windturbinepointall")
     @Override
     public List<Windturbinepoint> getAll(String wtId, String widget) {
@@ -101,4 +108,20 @@ public class WindturbinepointServiceImpl extends ServiceImpl<WindturbinepointMap
             throw new CustomException(ResultCode.ERROR_DATA);
         }
     }
+
+    @Override
+    public List<Object> getPointDataAll(String station, String wtId, String[] model,
+                                        String[] widget, String startTs, String endTs, String type) {
+        // 查询分类故障数据
+//        List<Casefault> listCase = getAll(station, model, widget, startTs, endTs);
+//
+//        if (listCase == null || listCase.size() == 0){
+//            return new ArrayList<>();
+//        }
+//
+//        for (Casefault fault : listCase){
+//
+//        }
+        return null;
+    }
 }

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

@@ -15,7 +15,24 @@ import java.util.List;
  */
 public interface CasefaultService extends IService<Casefault> {
 
-    List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et);
+    /**
+     * 批量查询所有数据
+     * @param station  场站
+     * @param model    风机型号 up82
+     * @param widget   风机部件
+     * @param st       开始时间
+     * @param et       结束时间
+     * @param ids      与oracle关联的snapid
+     * @return
+     */
+    List<Casefault> getAll(String station, String[] model, String[] widget, String st, String et, String[] ids);
+
+    /**
+     * 批量插入或更新
+     * @param list
+     * @return
+     */
+    boolean insertOrUpdate(List<Casefault> list);
 
     /**
      * 编辑数据

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

@@ -20,7 +20,7 @@ public interface CasefaultalgService extends IService<Casefaultalg> {
      * @param ids
      * @return
      */
-    List<Casefaultalg> getAllByIds(String... ids);
+    List<Casefaultalg> getAllByIds(String[] ids);
 
     /**
      * 批量插入或更新

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

@@ -1,5 +1,6 @@
 package com.gyee.sampleimpala.service.kudu;
 
+import com.gyee.sampleimpala.model.custom.TsPointData;
 import com.gyee.sampleimpala.model.kudu.Windturbinepoint;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -51,4 +52,19 @@ public interface WindturbinepointService extends IService<Windturbinepoint> {
      * @return
      */
     boolean deleteItem(String id);
+
+
+    /**
+     * 查询故障数据的原始点数据
+     * @param station  场站
+     * @param wtId     风机Id
+     * @param model    模型
+     * @param widget   部件
+     * @param startTs  开始时间
+     * @param endTs    结束时间
+     * @param type     测点类型
+     */
+    List<Object> getPointDataAll(String station, String wtId,
+                                 String[] model, String[] widget, String startTs, String endTs, String type);
+
 }

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.gyee.sampleimpala.mapper.CaseperformanceMapper">
+<mapper namespace="com.gyee.sampleimpala.mapper.kudu.CaseperformanceMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.gyee.sampleimpala.model.Caseperformance">
+    <resultMap id="BaseResultMap" type="com.gyee.sampleimpala.model.kudu.Caseperformance">
         <id column="id" property="id" />
         <result column="tag" property="tag" />
         <result column="stationen" property="stationen" />