石板泉、青山功率修改

gradeevaluation/src/main/java/com/gyee/gradeevaluation/service/bigscreen/BigScreenService.java

@@ -194,14 +194,14 @@ public class BigScreenService {
         map.put("xsfs",xsfs);
         double mhsgl = ednaApiUtil.getRealData(MainConstant.MHSDQ_POWER).getPointValueInDouble();// 麻黄山总功率
         double nssgl = ednaApiUtil.getRealData(MainConstant.NSSDQ_POWER).getPointValueInDouble();// 牛首山总功率
-        double qsgl= ednaApiUtil.getRealData(MainConstant.QSDQ_POWER).getPointValueInDouble();// 青山总功率
-        double sbqgl = ednaApiUtil.getRealData(MainConstant.SBQDQ_POWER).getPointValueInDouble();// 石板泉总功率
-        double sbqgl2 = ednaApiUtil.getRealData(MainConstant.SBQDQ_POWER2).getPointValueInDouble();// 石板泉总功率
+        double qsgl= ednaApiUtil.getRealData(MainConstant.JSFW_QSSSZGL).getPointValueInDouble();// 青山总功率
+        double sbqgl = ednaApiUtil.getRealData(MainConstant.JSFW_SBSSZGL).getPointValueInDouble();// 石板泉总功率
+//        double sbqgl2 = ednaApiUtil.getRealData(MainConstant.SBQDQ_POWER2).getPointValueInDouble();// 石板泉总功率
         double xsgl = ednaApiUtil.getRealData(MainConstant.XSDQ_POWER).getPointValueInDouble();// 香山总功率
         map.put("mhsgl",mhsgl);
         map.put("nssgl",nssgl);
         map.put("qsgl",qsgl);
-        map.put("sbqgl",sbqgl+sbqgl2);
+        map.put("sbqgl",sbqgl);
         map.put("xsgl",xsgl);
         double gfssgl = ednaApiUtil.getRealData(MainConstant.JSFW_GFSSZGL).getPointValueInDouble();// 总功率合计
         double gfrfdl = ednaApiUtil.getRealData(MainConstant.JSFW_GFRFDLB).getPointValueInDouble();// 光伏日发电量合计

gyee-sample-impala/src/main/java/com/gyee/impala/controller/diagnose/test/TrainDataController.java

@@ -0,0 +1,87 @@
+package com.gyee.impala.controller.diagnose.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.gyee.impala.common.result.JsonResult;
+import com.gyee.impala.common.result.ResultCode;
+import com.gyee.impala.common.spring.InitialRunner;
+import com.gyee.impala.common.util.DateUtil;
+import com.gyee.impala.model.custom.diagnose.DataInfo;
+import com.gyee.impala.model.custom.diagnose.ExecuteInfo;
+import com.gyee.impala.model.master.Casefaultalg;
+import com.gyee.impala.model.master.diagnose.Diagnosepoint;
+import com.gyee.impala.model.master.diagnose.Diagnosetrainhistory;
+import com.gyee.impala.service.custom.diagnose.DataDiagnoseService;
+import com.gyee.impala.service.master.CasefaultalgService;
+import jdk.nashorn.internal.ir.annotations.Ignore;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 故障数据及正常数据
+ */
+@CrossOrigin
+@RestController
+@RequestMapping("/api/test")
+public class TrainDataController {
+
+    @Autowired
+    private DataDiagnoseService diagnoseService;
+    @Autowired
+    private CasefaultalgService casefaultalgService;
+
+
+    @GetMapping("/traindata")
+    public JSONObject getData(String station, String wtId, String model, String faultTime, String normalTime, int preMinute) throws InterruptedException {
+        Casefaultalg one = casefaultalgService.getOne(station, wtId, model, faultTime, null);
+        if (one == null)
+            return JsonResult.error(4000, "数据不存在");
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(DateUtil.parseStrtoDate(faultTime));
+
+        ExecuteInfo executeInfo = new ExecuteInfo();
+        DataInfo dataInfo = new DataInfo();
+        dataInfo.setFaultTime(String.valueOf(calendar.getTime().getTime()));
+        calendar.add(Calendar.MINUTE, (-preMinute));
+        dataInfo.setStartTs(String.valueOf(calendar.getTime().getTime()));
+        calendar.add(Calendar.MINUTE, preMinute);
+        dataInfo.setEndTs(String.valueOf(calendar.getTime().getTime()));
+        dataInfo.setThingId(wtId);
+        dataInfo.setModelId(model);
+        dataInfo.setStationId(station);
+        dataInfo.setTag(one.getFaultcode());
+
+        DataInfo[] dataInfos = new DataInfo[1];
+        dataInfos[0] = dataInfo;
+        executeInfo.setDataInfos(dataInfos);
+
+        List<Diagnosepoint> list = InitialRunner.mapPoint.get(station).get(model);
+        diagnoseService.formatUniformcode(list);
+        String faultFile = diagnoseService.getFormDataAll(executeInfo);
+
+        Thread.sleep(2000);
+
+        ExecuteInfo executeInfo2 = new ExecuteInfo();
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(DateUtil.parseStrtoDate(normalTime));
+        cal.add(Calendar.MINUTE, (-preMinute));
+        dataInfo.setStartTs(String.valueOf(cal.getTime().getTime()));
+        cal.add(Calendar.MINUTE, preMinute);
+        dataInfo.setEndTs(String.valueOf(cal.getTime().getTime()));
+        DataInfo[] info = new DataInfo[1];
+        info[0] = dataInfo;
+        executeInfo2.setDataInfos(info);
+        String normalFile = diagnoseService.getFormDataAll(executeInfo);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("fault", faultFile);
+        map.put("normal", normalFile);
+
+        return JsonResult.successData(ResultCode.SUCCESS, map);
+    }
+}